--- np2/sound/fmtimer.c	2003/11/14 10:04:56	1.4
+++ np2/sound/fmtimer.c	2004/01/22 01:10:04	1.7
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
@@ -66,11 +66,11 @@ static void set_fmtimeraevent(BOOL absol
 	SINT32	l;
 
 	l = 18 * (1024 - fmtimer.timera);
-	if (pc.cpumode & CPUMODE_8MHz) {		// 4MHz
-		l = (l * 1248 / 625) * pc.multiple;
+	if (pccore.cpumode & CPUMODE_8MHz) {		// 4MHz
+		l = (l * 1248 / 625) * pccore.multiple;
 	}
-	else {									// 5MHz
-		l = (l * 1536 / 625) * pc.multiple;
+	else {										// 5MHz
+		l = (l * 1536 / 625) * pccore.multiple;
 	}
 	nevent_set(NEVENT_FMTIMERA, l, fmport_a, absolute);
 }
@@ -80,16 +80,16 @@ static void set_fmtimerbevent(BOOL absol
 	SINT32	l;
 
 	l = 288 * (256 - fmtimer.timerb);
-	if (pc.cpumode & CPUMODE_8MHz) {		// 4MHz
-		l = (l * 1248 / 625) * pc.multiple;
+	if (pccore.cpumode & CPUMODE_8MHz) {		// 4MHz
+		l = (l * 1248 / 625) * pccore.multiple;
 	}
-	else {									// 5MHz
-		l = (l * 1536 / 625) * pc.multiple;
+	else {										// 5MHz
+		l = (l * 1536 / 625) * pccore.multiple;
 	}
 	nevent_set(NEVENT_FMTIMERB, l, fmport_b, absolute);
 }
 
-void fmtimer_reset(BYTE irq) {
+void fmtimer_reset(UINT irq) {
 
 	ZeroMemory(&fmtimer, sizeof(fmtimer));
 
@@ -101,12 +101,12 @@ void fmtimer_reset(BYTE irq) {
 	fmtimer.intr = irq & 0xc0;
 	fmtimer.intdisabel = irq & 0x10;
 	fmtimer.irq = irqtable[irq >> 6];
-	pic_registext(fmtimer.irq);
+//	pic_registext(fmtimer.irq);
 }
 
-void fmtimer_setreg(BYTE reg, BYTE value) {
+void fmtimer_setreg(REG8 reg, REG8 value) {
 
-//	TRACEOUT(("fm %x %x [%.4x:%.4x]", reg, value, I286_CS, I286_IP));
+//	TRACEOUT(("fm %x %x [%.4x:%.4x]", reg, value, CPU_CS, CPU_IP));
 
 	switch(reg) {
 		case 0x24: