--- np2/nevent.h	2004/01/29 10:04:05	1.5
+++ np2/nevent.h	2004/03/23 04:45:03	1.7
@@ -10,16 +10,22 @@ enum {
 	NEVENT_MUSICGEN		= 4,
 	NEVENT_FMTIMERA		= 5,
 	NEVENT_FMTIMERB		= 6,
-	NEVENT_MOUSE		= 7,
-	NEVENT_KEYBOARD		= 8,
-	NEVENT_MIDIWAIT		= 9,
-	NEVENT_MIDIINT		= 10,
-	NEVENT_PICMASK		= 12,
-	NEVENT_S98TIMER		= 13,
-	NEVENT_CS4231		= 14,
-	NEVENT_GDCSLAVE		= 17,
-	NEVENT_FDBIOSBUSY	= 18,
-	NEVENT_FDCINT		= 19,
+		NEVENT_FMTIMER2A	= 7,
+		NEVENT_FMTIMER2B	= 8,
+		NEVENT_FMTIMER3A	= 9,
+		NEVENT_FMTIMER3B	= 10,
+		NEVENT_FMTIMER4A	= 11,
+		NEVENT_FMTIMER4B	= 12,
+	NEVENT_MOUSE		= 13,
+	NEVENT_KEYBOARD		= 14,
+	NEVENT_MIDIWAIT		= 15,
+	NEVENT_MIDIINT		= 16,
+	NEVENT_PICMASK		= 17,
+	NEVENT_S98TIMER		= 18,
+	NEVENT_CS4231		= 19,
+	NEVENT_GDCSLAVE		= 20,
+	NEVENT_FDBIOSBUSY	= 21,
+	NEVENT_FDCINT		= 22,
 	NEVENT_PC9861CH1	= 23,
 	NEVENT_PC9861CH2	= 24,
 	NEVENT_86PCM		= 25,
@@ -43,7 +49,7 @@ struct _neventitem {
 	SINT32		clock;
 	UINT32		flag;
 	NEVENTCB	proc;
-	UINT32		padding;
+	UINT32		param;
 };
 
 typedef struct {
@@ -62,7 +68,7 @@ extern "C" {
 extern	_NEVENT		nevent;
 
 // 初期化
-void nevent_init(void);
+void nevent_allreset(void);
 
 // 最短イベントのセット
 void nevent_get1stevent(void);