--- np2/sound/fmtimer.c	2003/11/14 10:04:56	1.4
+++ np2/sound/fmtimer.c	2003/12/08 00:55:33	1.5
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"i286.h"
+// #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
@@ -89,7 +89,7 @@ static void set_fmtimerbevent(BOOL absol
 	nevent_set(NEVENT_FMTIMERB, l, fmport_b, absolute);
 }
 
-void fmtimer_reset(BYTE irq) {
+void fmtimer_reset(UINT irq) {
 
 	ZeroMemory(&fmtimer, sizeof(fmtimer));
 
@@ -104,9 +104,9 @@ void fmtimer_reset(BYTE 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: