--- np2/bios/biosmem.h	2003/10/16 17:58:18	1.1.1.1
+++ np2/bios/biosmem.h	2005/05/20 13:59:46	1.9
@@ -1,38 +1,37 @@
 
 enum {
 	MEMB_EXPMMSZ			= 0x00401,
-	MEMB_DISK_EQUIPS		= 0x00483,
+	MEMB_SYS_TYPE			= 0x00480,
+	MEMB_DISK_EQUIPS		= 0x00482,
+	MEMB_F2HD_MODE			= 0x00493,
 
 	MEMB_BIOS_FLAG0			= 0x00500,
-	MEMB_BIOS_FLAG			= 0x00501,
+	MEMB_BIOS_FLAG1			= 0x00501,
 	MEMB_KB_COUNT			= 0x00528,
 	MEMB_KB_RETRY			= 0x00529,
 	MEMB_SHIFT_STS			= 0x0053a,
 	MEMB_CRT_RASTER			= 0x0053b,
 	MEMB_CRT_STS_FLAG		= 0x0053c,
+	MEMB_CRT_CNT			= 0x0053d,
 	MEMB_PRXCRT				= 0x0054c,
-	MEMB_RS_S_FLAG			= 0x0055b,
 	MEMB_PRXDUPD			= 0x0054d,
+	MEMB_RS_S_FLAG			= 0x0055b,
+	MEMB_DISK_INTL			= 0x0055e,
+	MEMB_DISK_INTH			= 0x0055f,
 	MEMB_DISK_BOOT			= 0x00584,
+	MEMB_CRT_BIOS			= 0x00597,
+	MEMB_F144_SUP			= 0x005ae,
 	MEMB_RS_D_FLAG			= 0x005c1,
 	MEMB_F2DD_MODE			= 0x005ca,
 
-	MEMB_MSW				= 0xa3fe2,
-	MEMB_MSW1				= 0xa3fe2,
-	MEMB_MSW2				= 0xa3fe6,
-	MEMB_MSW3				= 0xa3fea,
-	MEMB_MSW4				= 0xa3fee,
-	MEMB_MSW5				= 0xa3ff2,
-	MEMB_MSW6				= 0xa3ff6,
-	MEMB_MSW7				= 0xa3ffa,
-	MEMB_MSW8				= 0xa3ffe
-};
-
-enum {
 	MEMW_KB_BUF				= 0x00502,
 	MEMW_KB_SHIFT_TBL		= 0x00522,
 	MEMW_KB_BUF_HEAD		= 0x00524,
 	MEMW_KB_BUF_TAIL		= 0x00526,
+	MEMW_CRT_W_VRAMADR		= 0x00548,
+	MEMW_CRT_W_RASTER		= 0x0054a,
+	MEMW_PRXGLS				= 0x0054e,
+	MEMW_PRXGCPTN			= 0x0054e,
 	MEMW_RS_CH0_OFST		= 0x00556,
 	MEMW_RS_CH0_SEG			= 0x00558,
 	MEMW_DISK_EQUIP			= 0x0055c,
@@ -42,17 +41,32 @@ enum {
 	MEMW_F2DD_P_OFF			= 0x005cc,
 	MEMW_F2DD_P_SEG			= 0x005ce,
 	MEMW_F2HD_P_OFF			= 0x005f8,
-	MEMW_F2HD_P_SEG			= 0x005fa
+	MEMW_F2HD_P_SEG			= 0x005fa,
+
+	MEMD_F2DD_POINTER		= 0x005cc,
+	MEMD_F2HD_POINTER		= 0x005f8,
+
+	MEMX_DISK_XROM			= 0x004b0,
+	MEMX_KB_KY_STS			= 0x0052a,
+	MEMX_DISK_RESULT		= 0x00564
 };
 
 enum {
-	MEMD_F2DD_POINTER		= 0x005cc,
-	MEMD_F2HD_POINTER		= 0x005f8
+	MEMB_MSW1				= 0xa3fe2,
+	MEMB_MSW2				= 0xa3fe6,
+	MEMB_MSW3				= 0xa3fea,
+	MEMB_MSW4				= 0xa3fee,
+	MEMB_MSW5				= 0xa3ff2,
+	MEMB_MSW6				= 0xa3ff6,
+	MEMB_MSW7				= 0xa3ffa,
+	MEMB_MSW8				= 0xa3ffe,
+
+	MEMX_MSW				= 0xa3fe2
 };
 
 
-// #define	GETBIOSMEM8(a)		(mem[(a)])
-// #define	SETBIOSMEM8(a, b)	mem[(a)] = (b)
+#define	GETBIOSMEM8(a)		(mem[(a)])
+#define	SETBIOSMEM8(a, b)	mem[(a)] = (b)
 
 #if defined(BYTESEX_LITTLE)
 
@@ -65,15 +79,21 @@ enum {
 #elif defined(BYTESEX_BIG)
 
 #define	GETBIOSMEM16(a)		((UINT16)(mem[(a)+0] + (mem[(a)+1] << 8)))
-#define	SETBIOSMEM16(a, b)	mem[(a)+0] = (BYTE)(b);				\
-							mem[(a)+1] = (BYTE)((b) >> 8)
+#define	SETBIOSMEM16(a, b)											\
+						do {										\
+							mem[(a)+0] = (UINT8)(b);				\
+							mem[(a)+1] = (UINT8)((b) >> 8);			\
+						} while(0)
 
 #define	GETBIOSMEM32(a)		((UINT32)(mem[(a)+0] + (mem[(a)+1] << 8) +	\
 							(mem[(a)+2] << 16) + (mem[(a)+3] << 24)))
-#define	SETBIOSMEM32(a, b)	mem[(a)+0] = (BYTE)(b);				\
-							mem[(a)+1] = (BYTE)((b) >> 8);		\
-							mem[(a)+2] = (BYTE)((b) >> 16);		\
-							mem[(a)+3] = (BYTE)((b) >> 24)
+#define	SETBIOSMEM32(a, b)											\
+						do {										\
+							mem[(a)+0] = (UINT8)(b);				\
+							mem[(a)+1] = (UINT8)((b) >> 8);			\
+							mem[(a)+2] = (UINT8)((b) >> 16);		\
+							mem[(a)+3] = (UINT8)((b) >> 24);		\
+						} while(0)
 
 #endif