--- np2/statsave.tbl	2004/01/27 07:24:25	1.19
+++ np2/statsave.tbl	2004/02/07 21:23:21	1.23
@@ -1,5 +1,5 @@
 
-#define		NP2STATUS_VERSION		0731
+#define		NP2STATUS_VERSION		0732
 
 static const NP2FHDR np2flagdef = {
 						"Neko Project II",
@@ -16,7 +16,7 @@ static const PROCTBL evtproc[] = {
 			{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','k','e','y'), keybrd_callback},
 			{PROCID('e','m','d','0'), midiwaitout},
 			{PROCID('e','m','d','1'), midiint},
 			{PROCID('e','p','i','c'), picmask},
@@ -24,9 +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','p','k','1'), pc9861ch1cb},
-			{PROCID('e','p','k','2'), pc9861ch2cb},
+			{PROCID('e','f','i','w'), fdc_intwait},
 			{PROCID('e','p','8','6'), pcm86_cb},
 			{PROCID('e','a','m','d'), amd98int},
 #if defined(SUPPORT_SASI)
@@ -35,6 +33,10 @@ static const PROCTBL evtproc[] = {
 #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[] = {
@@ -54,7 +56,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},
@@ -129,6 +131,9 @@ static const SFENTRY np2tbl[] = {
 #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