--- np2/vram/vram.h	2003/10/16 17:58:13	1.1
+++ np2/vram/vram.h	2004/02/18 21:58:41	1.3
@@ -6,9 +6,11 @@
 
 typedef struct {
 	UINT	operate;
+#if !defined(CPUSTRUC_MEMWAIT)
 	UINT	tramwait;
 	UINT	vramwait;
 	UINT	grcgwait;
+#endif
 } VRAM_T;
 
 // operate:		bit0	access page
@@ -40,7 +42,13 @@ extern	VRAM_T	vramop;
 extern	BYTE	tramupdate[0x1000];
 extern	BYTE	vramupdate[0x8000];
 
-void vram_init(void);
+void vram_initialize(void);
+
+#if !defined(CPUSTRUC_MEMWAIT)
+#define	MEMWAIT_TRAM	vramop.tramwait
+#define	MEMWAIT_VRAM	vramop.vramwait
+#define	MEMWAIT_GRCG	vramop.grcgwait
+#endif
 
 #ifdef __cplusplus
 }