--- xmil/io/crtc.h	2004/08/17 14:46:37	1.12
+++ xmil/io/crtc.h	2008/06/02 20:07:31	1.15
@@ -24,34 +24,75 @@ enum {
 #define	PAL_4096		0x10
 
 
-#define	SCRN_BANK0			0x00
-#define	SCRN_BANK1			0x80
-#define	SCRN_DRAW4096		0x40
-
-#define	SCRN64_MASK				0x0f
-#define	SCRN64_INVALID			0
-#define	SCRN64_320x200			1
-#define	SCRN64_L320x200x2		2
-#define	SCRN64_L640x200			3
-#define	SCRN64_H320x400			4
-#define	SCRN64_320x200x4096		5
-
-#define	SCRN64_320x100			6
-#define	SCRN64_320x100x2		7
-#define	SCRN64_L640x100			8
-#define	SCRN64_H320x200			9
-#define	SCRN64_320x100x4096		10
+#if !defined(SUPPORT_TURBOZ)
+enum {
+	DISPMODE_24KHZ			= 0x01,
+	DISPMODE_200L			= 0x02,
+	DISPMODE_TEXTYx2		= 0x04,
+	DISPMODE_UNDERLINE		= 0x08,
+
+	DISPMODE_MASKMODE		= 0x0f,
+	DISPMODE_WIDTH80		= 0x40,
+	DISPMODE_BANK1			= 0x80
+};
+#else
+enum {
+	DISPMODE_24KHZ			= 0x01,
+	DISPMODE_200L			= 0x02,
+	DISPMODE_TEXTYx2		= 0x04,
+	DISPMODE_UNDERLINE		= 0x08,
+
+	DISPMODE_SCRN64			= 0x10,
+	DISPMODE64_320x200		= 0x10,
+	DISPMODE64_L320x200x2	= 0x11,
+	DISPMODE64_L640x200		= 0x12,
+	DISPMODE64_H320x400		= 0x13,
+	DISPMODE64_320x200x4096	= 0x14,
+	DISPMODE64_320x100		= 0x15,
+	DISPMODE64_320x100x2	= 0x16,
+	DISPMODE64_L640x100		= 0x17,
+	DISPMODE64_H320x200		= 0x18,
+	DISPMODE64_320x100x4096	= 0x19,
+
+	DISPMODE_MASKMODE		= 0x1f,
+	DISPMODE_4096			= 0x20,
+	DISPMODE_WIDTH80		= 0x40,
+	DISPMODE_BANK1			= 0x80
+};
+#endif
+
 
+enum {
+	SCRN_BANK0				= 0x00,
+	SCRN_BANK1				= 0x80,
+	SCRN_WIDTH80			= 0x40,
+	SCRN_DRAW4096			= 0x20,
+
+	SCRN64_320x200			= 0x10,
+	SCRN64_L320x200x2		= 0x11,
+	SCRN64_L640x200			= 0x12,
+	SCRN64_H320x400			= 0x13,
+	SCRN64_320x200x4096		= 0x14,
+	SCRN64_320x100			= 0x15,
+	SCRN64_320x100x2		= 0x16,
+	SCRN64_L640x100			= 0x17,
+	SCRN64_H320x200			= 0x18,
+	SCRN64_320x100x4096		= 0x19,
+
+	SCRN64_MASK				= 0x1f,
+	SCRN64_ENABLE			= 0x10
+};
 
 
-//	SCRN_24KHZ		0x01	// 0:15KHz		1:24KHz
-//	SCRN_200LINE	0x02	// 0:400line	1:200line
-//	SCRN_TEXTYx2	0x04	// 0:ノーマル	1:縦に拡大
-//	SCRN_DISPVRAM	0x08	// 0:表			1:裏
-//	SCRN_ACCESSVRAM	0x10	// 0:表			1:裏
-//	SCRN_PCGMODE	0x20	// 0:互換		1:高速
-//	SCRN_CPUFONT	0x40	// 0:8ラスタ	1:16ラスタ
-//	SCRN_UNDERLINE	0x80	// 0:なし		1:あり
+/*	SCRN_24KHZ		0x01	- 0:15KHz		1:24KHz
+ *	SCRN_200LINE	0x02	- 0:400line		1:200line
+ *	SCRN_TEXTYx2	0x04	- 0:ノーマル	1:縦に拡大
+ *	SCRN_DISPVRAM	0x08	- 0:表			1:裏
+ *	SCRN_ACCESSVRAM	0x10	- 0:表			1:裏
+ *	SCRN_PCGMODE	0x20	- 0:互換		1:高速
+ *	SCRN_CPUFONT	0x40	- 0:8ラスタ		1:16ラスタ
+ *	SCRN_UNDERLINE	0x80	- 0:なし		1:あり
+ */
 
 enum {
 	SCRN_24KHZ		= 0x01,
@@ -63,7 +104,7 @@ enum {
 	SCRN_CPUFONT	= 0x40,
 	SCRN_UNDERLINE	= 0x80,
 
-	SCRN_DISPCHANGE	= SCRN_24KHZ|SCRN_200LINE|SCRN_TEXTYx2|SCRN_UNDERLINE
+	SCRN_DISPCHANGE	= SCRN_24KHZ + SCRN_200LINE + SCRN_TEXTYx2 + SCRN_DISPVRAM + SCRN_UNDERLINE
 };
 
 enum {
@@ -99,26 +140,37 @@ typedef struct {
 } CRTCSTAT;
 
 typedef struct {
-	SINT32	rasterclock8;
-	SINT32	rasterdisp8;
-	UINT	fonty;
-	UINT	yl;
-	SINT32	frameclock;
-
-	UINT8	*gram;				// curvram
-	UINT	updatemask;			// updatemsk
-	UINT8	updatebit;			// curupdt
+	UINT8	scrnflash;
+	UINT8	scrnallflash;
+	UINT8	remakeattr;							/* doubleatrchange */
+	UINT8	palandply;
+
+	UINT8	*gramacc;							/* curvram */
+#if (!defined(MEMOPTIMIZE)) || (MEMOPTIMIZE < 100)
+	UINT	updatemask;							/* updatemsk */
+	UINT8	updatebit;							/* curupdt */
+#else
+	UINT8	updatebit;							/* curupdt */
+	UINT8	_padding1;
+	UINT16	updatemask;							/* updatemsk */
+	UINT8	_padding2;
+#endif
 	UINT8	dispmode;
+	UINT8	existblink;							/* blinkflag */
+	UINT8	blinktime;
+
 #if defined(SUPPORT_TURBOZ)
 	UINT8	pal_bank;
 	UINT8	pal_disp;
+	UINT8	pal_padding[2];
 #endif
 
+	SINT32	rasterclock8;
+	SINT32	rasterdisp8;
+	SINT32	frameclock;
+	UINT	fonty;
+	UINT	yl;
 	UINT	pos;
-
-	SINT32	dispclock;
-	SINT32	vsyncstart;
-	SINT32	vpulseclock;
 } CRTCEXT;
 
 #if defined(SUPPORT_TURBOZ)
@@ -130,43 +182,43 @@ typedef struct {
 #endif
 
 typedef struct {
-	CRTCSTAT	s;
 	CRTCEXT		e;
+	CRTCSTAT	s;
 #if defined(SUPPORT_TURBOZ)
 	CRTCPAL		p;
 #endif
 } CRTC;
 
 
-// ----
+/* functions */
 
 void crtc_setwidth(REG8 width40);
 void crtc_update(void);
 
-void IOOUTCALL crtc_o(UINT port, REG8 value);			// x1_crtc_w
+void IOOUTCALL crtc_o(UINT port, REG8 value);
 
-void IOOUTCALL scrn_o(UINT port, REG8 value);			// x1_scrn_w
-REG8 IOINPCALL scrn_i(UINT port);						// x1_scrn_r
+void IOOUTCALL scrn_o(UINT port, REG8 value);
+REG8 IOINPCALL scrn_i(UINT port);
 
-void IOOUTCALL ply_o(UINT port, REG8 value);			// x1_ply_w
-void IOOUTCALL palette_o(UINT port, REG8 value);		// x1_palet_w
+void IOOUTCALL ply_o(UINT port, REG8 value);
+void IOOUTCALL palette_o(UINT port, REG8 value);
 
-void IOOUTCALL blackctrl_o(UINT port, REG8 value);		// x1_blackctrl_w
-REG8 IOINPCALL blackctrl_i(UINT port);					// x1_blackctrl_r
+void IOOUTCALL blackctrl_o(UINT port, REG8 value);
+REG8 IOINPCALL blackctrl_i(UINT port);
 
 
 #if defined(SUPPORT_TURBOZ)
-REG8 IOINPCALL ply_i(UINT port);						// x1_ply_r
-REG8 IOINPCALL palette_i(UINT port);					// x1_palet_r
+REG8 IOINPCALL ply_i(UINT port);
+REG8 IOINPCALL palette_i(UINT port);
 
-void IOOUTCALL extpal_o(UINT port, REG8 value);			// x1_extpal_w
-REG8 IOINPCALL extpal_i(UINT port);						// x1_extpal_r
-void IOOUTCALL extgrphpal_o(UINT port, REG8 value);		// x1_extgrphpal_w
-REG8 IOINPCALL extgrphpal_i(UINT port);					// x1_extgrphpal_r
-void IOOUTCALL exttextpal_o(UINT port, REG8 value);		// x1_exttextpal_w
-REG8 IOINPCALL exttextpal_i(UINT port);					// x1_exttextpal_r
-void IOOUTCALL exttextdisp_o(UINT port, REG8 value);	// x1_exttextdisp_w
-REG8 IOINPCALL exttextdisp_i(UINT port);				// x1_exttextdisp_r
+void IOOUTCALL extpal_o(UINT port, REG8 value);
+REG8 IOINPCALL extpal_i(UINT port);
+void IOOUTCALL extgrphpal_o(UINT port, REG8 value);
+REG8 IOINPCALL extgrphpal_i(UINT port);
+void IOOUTCALL exttextpal_o(UINT port, REG8 value);
+REG8 IOINPCALL exttextpal_i(UINT port);
+void IOOUTCALL exttextdisp_o(UINT port, REG8 value);
+REG8 IOINPCALL exttextdisp_i(UINT port);
 #endif