--- xmil/vram/makescrn.h	2004/08/07 07:19:56	1.1
+++ xmil/vram/makescrn.h	2004/08/18 08:08:13	1.9
@@ -1,35 +1,34 @@
 
-#define	TRAM_MAX	0x800
-
-#define	UPDATEVRAM0BIT	6
-#define	UPDATEVRAM1BIT	7
-#define	UPDATE_TRAM		(1 << 5)
-#define	UPDATE_VRAM0	(1 << UPDATEVRAM0BIT)
-#define	UPDATE_VRAM1	(1 << UPDATEVRAM1BIT)
-#define	UPDATE_VRAM		(UPDATE_VRAM0 | UPDATE_VRAM1)
-#define	UPDATE_TVRAM	(UPDATE_VRAM0 | UPDATE_VRAM1 | UPDATE_TRAM)
-
-#define	ANK_24KHz		1
-#define	KNJ_24KHz		2
-
 enum {
-	MAKESCRN_PAL		= 0x01,
-	MAKESCRN_PLY		= 0x02,
-	MAKESCRN_MODE		= 0x04
+	MAKESCRN_320x200S	= 0,
+	MAKESCRN_640x200S	= 1,
+	MAKESCRN_320x200H	= 2,
+	MAKESCRN_640x200H	= 3,
+	MAKESCRN_320x400	= 4,
+	MAKESCRN_640x400	= 5,
+	MAKESCRN_4096		= 6
 };
 
+
 typedef struct {
 	UINT8	scrnflash;
+	UINT8	_scrnallflash;
 	UINT8	remakeattr;							// doubleatrchange
 	UINT8	palandply;
-	UINT8	existblink;							// blinkflag
 
+	UINT8	*disp1;
+	UINT8	*disp2;
+	UINT8	dispflag;
+	UINT8	existblink;							// blinkflag
+	UINT8	blinktest;
+	UINT8	blinktime;
 
-//	UINT8	*disp1;
-//	UINT8	dispflag;
-//	UINT8	blinktest;
-//	UINT8	blinktime;
+	UINT8	dispmode;
+	UINT8	drawmode;
+	UINT8	nextdraw;
+	UINT8	_padding;
 
+	UINT	vramtop;
 	UINT	fontycnt;
 	UINT	fontcy;
 	UINT	charcy;
@@ -37,9 +36,9 @@ typedef struct {
 	UINT	surfcx;
 	UINT	surfcy;
 	UINT	surfrx;
+	UINT	surfsy;
 	UINT	surfstep;
 	UINT	vramsize;
-
 } MAKESCRN;
 
 
@@ -49,13 +48,13 @@ extern "C" {
 
 extern	MAKESCRN	makescrn;
 
-extern	BYTE	updatetmp[0x800+0x101];
-extern	BYTE	scrnallflash;
-extern	DWORD	drawtime;
+extern	UINT8	scrnallflash;
+extern	UINT	drawtime;
 
 
-void init_draw(void);
 void scrnupdate(void);
+void makescrn_initialize(void);
+void makescrn_reset(void);
 
 #ifdef __cplusplus
 }