--- np2/statsave.tbl	2004/01/22 01:10:03	1.16
+++ np2/statsave.tbl	2004/01/29 10:04:05	1.20
@@ -24,7 +24,7 @@ static const PROCTBL evtproc[] = {
 			{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','f','i','w'), fdc_intwait},
 			{PROCID('e','p','k','1'), pc9861ch1cb},
 			{PROCID('e','p','k','2'), pc9861ch2cb},
 			{PROCID('e','p','8','6'), pcm86_cb},
@@ -54,7 +54,7 @@ static const ENUMTBL evtnum[] = {
 			{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},
@@ -77,11 +77,12 @@ static const PROCTBL dmaproc[] = {
 			{PROCID('d','e','c','s'), cs4231dmafunc}};
 
 static const SFENTRY np2tbl[] = {
-	{"CPU286",		0,	STATFLAG_CLOCK,	&CPU_STATSAVE,	sizeof(CPU_STATSAVE)},
+	{"PCCORE",		0,	STATFLAG_BIN,	&pccore,		sizeof(pccore)},
+
+	{"CPU286",		0,	STATFLAG_BIN,	&CPU_STATSAVE,	sizeof(CPU_STATSAVE)},
 	{"MEMORY",		0,	STATFLAG_MEM,	NULL,			0x130000},
 	{"EXTMEM",		0,	STATFLAG_EXT,	NULL,			0},
 
-	{"CORE",		0,	STATFLAG_CLOCK,	&pccore,		sizeof(pccore)},
 	{"ARTIC",		0,	STATFLAG_BIN,	&artic,			sizeof(artic)},
 	{"CGROM",		0,	STATFLAG_BIN,	&cgrom,			sizeof(cgrom)},
 #if !defined(CGWND_FONTPTR)
@@ -95,6 +96,9 @@ 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)},
@@ -119,6 +123,12 @@ static const SFENTRY np2tbl[] = {
 	{"CMMPU98",		0,	STATFLAG_COM,	(void *)0,		0},
 	{"CMRS232C",	0,	STATFLAG_COM,	(void *)1,		0},
 	{"DISK",		0,	STATFLAG_DISK,	NULL,			0},
+#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_HOSTDRV)
 	{"HOSTDRV",		0,	STATFLAG_HDRV,	NULL,			0},
 #endif