--- np2/cbus/pcm86io.c	2003/10/16 17:58:01	1.1.1.1
+++ np2/cbus/pcm86io.c	2003/10/21 11:22:05	1.3
@@ -1,11 +1,10 @@
 #include	"compiler.h"
-#include	"dosio.h"
 #include	"i286.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"pcm86io.h"
 #include	"sound.h"
 #include	"fmboard.h"
-#include	"pcm86io.h"
 
 
 extern	PCM86CFG	pcm86cfg;
@@ -49,8 +48,7 @@ static void IOOUTCALL pcm86_oa468(UINT p
 		pcm86.virbuf = 0;
 		pcm86.write = 0;
 		pcm86.reqirq = 0;
-		pcm86.lastclock = nevent.clock + nevent.baseclock -
-														nevent.remainclock;
+		pcm86.lastclock = I286_CLOCK + I286_BASECLOCK - I286_REMCLOCK;
 		pcm86.lastclock <<= 6;
 	}
 	// サンプリングレート変更
@@ -60,8 +58,7 @@ static void IOOUTCALL pcm86_oa468(UINT p
 	}
 	pcm86.fifo = val & (~0x10);
 	if ((xchgbit & 0x80) && (val & 0x80)) {
-		pcm86.lastclock = nevent.clock + nevent.baseclock -
-														nevent.remainclock;
+		pcm86.lastclock = I286_CLOCK + I286_BASECLOCK - I286_REMCLOCK;
 		pcm86.lastclock <<= 6;
 	}
 	pcm86.write = 1;
@@ -128,7 +125,7 @@ static BYTE IOINPCALL pcm86_ia466(UINT p
 	BYTE	ret;
 
 	sound_sync();
-	nowclk = nevent.clock + nevent.baseclock - nevent.remainclock;
+	nowclk = I286_CLOCK + I286_BASECLOCK - I286_REMCLOCK;
 	nowclk <<= 6;
 	past = nowclk - pcm86.lastclock;
 	if (past >= pcm86.stepclock) {