--- np2/statsave.tbl	2004/01/27 07:24:25	1.19
+++ np2/statsave.tbl	2004/07/01 11:42:54	1.32
@@ -1,5 +1,5 @@
 
-#define		NP2STATUS_VERSION		0731
+#define		NP2STATUS_VERSION		0770
 
 static const NP2FHDR np2flagdef = {
 						"Neko Project II",
@@ -12,29 +12,32 @@ static const PROCTBL evtproc[] = {
 			{PROCID('e','p','i','t'), systimer},
 			{PROCID('e','b','e','p'), beeponeshot},
 			{PROCID('e','r','s','1'), rs232ctimer},
-			{PROCID('e','m','g','n'), musicgenint},
-			{PROCID('e','f','m','a'), fmport_a},
-			{PROCID('e','f','m','b'), fmport_b},
 			{PROCID('e','m','u','s'), mouseint},
-			{PROCID('e','k','e','y'), keyb_callback},
-			{PROCID('e','m','d','0'), midiwaitout},
-			{PROCID('e','m','d','1'), midiint},
+			{PROCID('e','k','e','y'), keyboard_callback},
 			{PROCID('e','p','i','c'), picmask},
-//			{PROCID('e','s','9','8'), s98timer},
-			{PROCID('e','c','s','d'), cs4231_dma},
 			{PROCID('e','g','s','w'), gdcslavewait},
 			{PROCID('e','f','b','o'), fdbiosout},
-			{PROCID('e','f','d','7'), fdcbusy_error7},
-			{PROCID('e','p','k','1'), pc9861ch1cb},
-			{PROCID('e','p','k','2'), pc9861ch2cb},
+			{PROCID('e','f','i','w'), fdc_intwait},
+			{PROCID('e','m','d','0'), midiwaitout},
+			{PROCID('e','m','d','1'), midiint},
+#if !defined(DISABLE_SOUND)
+			{PROCID('e','m','g','n'), musicgenint},
+			{PROCID('e','f','m','a'), fmport_a},
+			{PROCID('e','f','m','b'), fmport_b},
+			{PROCID('e','c','s','d'), cs4231_dma},
 			{PROCID('e','p','8','6'), pcm86_cb},
 			{PROCID('e','a','m','d'), amd98int},
+#endif
 #if defined(SUPPORT_SASI)
 			{PROCID('e','s','a','s'), sasiioint},
 #endif
 #if defined(SUPPORT_SCSI)
 			{PROCID('e','s','c','s'), scsiioint},
 #endif
+#if defined(SUPPORT_PC9861K)
+			{PROCID('e','p','k','1'), pc9861ch1cb},
+			{PROCID('e','p','k','2'), pc9861ch2cb},
+#endif
 };
 
 static const ENUMTBL evtnum[] = {
@@ -50,11 +53,10 @@ static const ENUMTBL evtnum[] = {
 			{PROCID('m','i','d','w'), NEVENT_MIDIWAIT},
 			{PROCID('m','i','d','i'), NEVENT_MIDIINT},
 			{PROCID('p','i','c','m'), NEVENT_PICMASK},
-//			{PROCID('s','9','8',' '), NEVENT_S98TIMER},
 			{PROCID('4','2','3','1'), NEVENT_CS4231},
 			{PROCID('g','d','c','s'), NEVENT_GDCSLAVE},
 			{PROCID('f','d','b','b'), NEVENT_FDBIOSBUSY},
-			{PROCID('f','d','c','b'), NEVENT_FDCBUSY},
+			{PROCID('f','d','c','i'), NEVENT_FDCINT},
 			{PROCID('k','c','h','1'), NEVENT_PC9861CH1},
 			{PROCID('k','c','h','2'), NEVENT_PC9861CH2},
 			{PROCID('p','c','m','8'), NEVENT_86PCM},
@@ -69,12 +71,15 @@ static const PROCTBL dmaproc[] = {
 			{PROCID('d','o','f','d'), fdc_dataread},
 			{PROCID('d','i','f','d'), fdc_datawrite},
 			{PROCID('d','e','f','d'), fdc_dmafunc},
+#if !defined(DISABLE_SOUND)
+			{PROCID('d','e','c','s'), cs4231dmafunc},
+#endif
 #if defined(SUPPORT_SASI)
 			{PROCID('d','o','s','a'), sasi_dataread},
 			{PROCID('d','i','s','a'), sasi_datawrite},
 			{PROCID('d','e','s','a'), sasi_dmafunc},
 #endif
-			{PROCID('d','e','c','s'), cs4231dmafunc}};
+	};
 
 static const SFENTRY np2tbl[] = {
 	{"PCCORE",		0,	STATFLAG_BIN,	&pccore,		sizeof(pccore)},
@@ -82,6 +87,9 @@ static const SFENTRY np2tbl[] = {
 	{"CPU286",		0,	STATFLAG_BIN,	&CPU_STATSAVE,	sizeof(CPU_STATSAVE)},
 	{"MEMORY",		0,	STATFLAG_MEM,	NULL,			0x130000},
 	{"EXTMEM",		0,	STATFLAG_EXT,	NULL,			0},
+#if defined(SUPPORT_PC9821)
+	{"VRAMEX",		0,	STATFLAG_BIN,	vramex,			sizeof(vramex)},
+#endif
 
 	{"ARTIC",		0,	STATFLAG_BIN,	&artic,			sizeof(artic)},
 	{"CGROM",		0,	STATFLAG_BIN,	&cgrom,			sizeof(cgrom)},
@@ -96,14 +104,12 @@ static const SFENTRY np2tbl[] = {
 	{"EGC",			0,	STATFLAG_EGC,	NULL,			0},
 	{"EPSON",		0,	STATFLAG_EPSON,	NULL,			0},
 	{"FDC",			0,	STATFLAG_BIN,	&fdc,			sizeof(fdc)},
-#if !defined(CPUCORE_IA32)
 	{"EMSIO",		0,	STATFLAG_BIN,	&emsio,			sizeof(emsio)},
-#endif
 	{"GDC1",		0,	STATFLAG_BIN,	&gdc,			sizeof(gdc)},
 	{"GDC2",		0,	STATFLAG_BIN,	&gdcs,			sizeof(gdcs)},
 	{"PIT",			0,	STATFLAG_BIN,	&pit,			sizeof(pit)},
-	{"MPU98II",		0,	STATFLAG_BIN,	&mpu98,			sizeof(mpu98)},
 	{"MOUSE",		0,	STATFLAG_BIN,	&mouseif,		sizeof(mouseif)},
+	{"NECIO",		0,	STATFLAG_BIN,	&necio,			sizeof(necio)},
 	{"NMIIO",		0,	STATFLAG_BIN,	&nmiio,			sizeof(nmiio)},
 	{"NP2SYSPORT",	0,	STATFLAG_BIN,	&np2sysp,		sizeof(np2sysp)},
 	{"PIC",			0,	STATFLAG_BIN,	&pic,			sizeof(pic)},
@@ -115,20 +121,30 @@ static const SFENTRY np2tbl[] = {
 	{"GAIJI",		0,	STATFLAG_GIJ,	NULL,			0},
 	{"EVENT",		0,	STATFLAG_EVT,	&nevent,		sizeof(nevent)},
 	{"CALENDAR",	0,	STATFLAG_BIN,	&cal,			sizeof(cal)},
+	{"KEYSTAT",		0,	STATFLAG_BIN,	&keyctrl,		sizeof(keyctrl)},
 	{"PALEVENT",	0,	STATFLAG_BIN,	&palevent,		sizeof(palevent)},
-	{"FMBOARD",		0,	STATFLAG_FM,	NULL,			0},
-	{"AMD98",		0,	STATFLAG_BIN,	&amd98,			sizeof(amd98)},
-	{"MUSICGEN",	0,	STATFLAG_BIN,	&musicgen,		sizeof(musicgen)},
-	{"BEEP",		0,	STATFLAG_BIN,	&beep,			sizeof(beep)},
+	{"MPU98II",		0,	STATFLAG_BIN,	&mpu98,			sizeof(mpu98)},
 	{"CMMPU98",		0,	STATFLAG_COM,	(void *)0,		0},
 	{"CMRS232C",	0,	STATFLAG_COM,	(void *)1,		0},
 	{"DISK",		0,	STATFLAG_DISK,	NULL,			0},
+#if !defined(DISABLE_SOUND)
+	{"BEEP",		0,	STATFLAG_BIN,	&beep,			sizeof(beep)},
+	{"MUSICGEN",	0,	STATFLAG_BIN,	&musicgen,		sizeof(musicgen)},
+	{"FMBOARD",		0,	STATFLAG_FM,	NULL,			0},
+	{"AMD98",		0,	STATFLAG_BIN,	&amd98,			sizeof(amd98)},
+#endif
+#if defined(SUPPORT_IDEIO)
+	{"IDE",			0,	STATFLAG_BIN,	&ideio,			sizeof(ideio)},
+#endif
 #if defined(SUPPORT_SASI)
 	{"SASI",		0,	STATFLAG_BIN,	&sasiio,		sizeof(sasiio)},
 #endif
 #if defined(SUPPORT_SCSI)
 	{"SCSI",		0,	STATFLAG_BIN,	&scsiio,		sizeof(scsiio)},
 #endif
+#if defined(SUPPORT_PC9861K)
+	{"PC9861K",		0,	STATFLAG_BIN,	&pc9861k,		sizeof(pc9861k)},
+#endif
 #if defined(SUPPORT_HOSTDRV)
 	{"HOSTDRV",		0,	STATFLAG_HDRV,	NULL,			0},
 #endif