--- np2/io/pit.c	2003/12/01 17:13:36	1.9
+++ np2/io/pit.c	2004/03/12 18:19:57	1.19
@@ -3,42 +3,31 @@
 // 
 
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
 #include	"beep.h"
 
 
-// #define	uPD71054					// NP2はuPD8253Cベース
 #define	BEEPCOUNTEREX					// BEEPアイドル時のカウンタをα倍に
+#if defined(CPUCORE_IA32)
+// #define	uPD71054			// だめぽ ＿|￣|○
+#endif
 
 
 // --- Interval timer
 
-// ver0.31 常に回す…
-static void setsystimerevent_noint(BOOL absolute) {
-
-	nevent_set(NEVENT_ITIMER, pc.multiple << 16, systimer_noint, absolute);
-}
-
-void systimer_noint(NEVENTITEM item) {
-
-	if (item->flag & NEVENT_SETEVENT) {
-		setsystimerevent_noint(NEVENT_RELATIVE);
-	}
-}
-
 static void setsystimerevent(BOOL absolute) {
 
 	SINT32	cnt;
 
 	cnt = pit.value[0];
 	if (cnt > 8) {									// 根拠なし
-		cnt *= pc.multiple;
+		cnt *= pccore.multiple;
 	}
 	else {
-		cnt = pc.multiple << 16;
+		cnt = pccore.multiple << 16;
 	}
 	nevent_set(NEVENT_ITIMER, cnt, systimer, absolute);
 }
@@ -56,7 +45,7 @@ void systimer(NEVENTITEM item) {
 			setsystimerevent(NEVENT_RELATIVE);
 		}
 		else {
-			nevent_set(NEVENT_ITIMER, pc.multiple << 16,
+			nevent_set(NEVENT_ITIMER, pccore.multiple << 16,
 												systimer, NEVENT_RELATIVE);
 		}
 	}
@@ -72,10 +61,10 @@ static void setbeepeventex(BOOL absolute
 
 	cnt = pit.value[1];
 	if (cnt > 2) {
-		cnt *= pc.multiple;
+		cnt *= pccore.multiple;
 	}
 	else {
-		cnt = pc.multiple << 16;
+		cnt = pccore.multiple << 16;
 	}
 	while(cnt < 0x100000) {
 		cnt <<= 1;
@@ -90,10 +79,10 @@ static void setbeepevent(BOOL absolute) 
 
 	cnt = pit.value[1];
 	if (cnt > 2) {
-		cnt *= pc.multiple;
+		cnt *= pccore.multiple;
 	}
 	else {
-		cnt = pc.multiple << 16;
+		cnt = pccore.multiple << 16;
 	}
 	nevent_set(NEVENT_BEEP, cnt, beeponeshot, absolute);
 }
@@ -104,7 +93,7 @@ void beeponeshot(NEVENTITEM item) {
 		if (!(pit.mode[1] & 0x0c)) {								// ver0.30
 			beep_lheventset(0);
 		}
-#ifdef uPD71054
+#if defined(uPD71054)
 		if ((pit.mode[1] & 0x06) == 0x02)
 #else
 		if (pit.mode[1] & 0x02)
@@ -127,10 +116,10 @@ static void setrs232cevent(BOOL absolute
 	SINT32	cnt;
 
 	if (pit.value[2] > 1) {
-		cnt = pc.multiple * pit.value[2] * rs232c.mul;
+		cnt = pccore.multiple * pit.value[2] * rs232c.mul;
 	}
 	else {
-		cnt = (pc.multiple << 16) * rs232c.mul;
+		cnt = (pccore.multiple << 16) * rs232c.mul;
 	}
 	nevent_set(NEVENT_RS232C, cnt, rs232ctimer, absolute);
 }
@@ -149,18 +138,20 @@ void rs232ctimer(NEVENTITEM item) {
 
 // ---------------------------------------------------------------------------
 
-static UINT16 itimer_latch(int ch) {
+static UINT pit_latch(int ch) {
 
 	SINT32	clock;
 
 	if (ch == 1) {
 		switch(pit.mode[1] & 0x06) {
+#ifdef uPD71054				// ?
 			case 0x00:
+#endif
 			case 0x04:
 				return(pit.value[1]);
 #ifdef uPD71054
 			case 0x06:
-				return(pit.value[1] & 0xfffe);
+				return(pit.value[1] & (~1));
 #endif
 		}
 #if defined(BEEPCOUNTEREX)
@@ -168,36 +159,36 @@ static UINT16 itimer_latch(int ch) {
 		if (clock < 0) {
 			return(0);
 		}
-		clock /= pc.multiple;
+		clock /= pccore.multiple;
 		if (pit.value[1] > 2) {
 			clock %= pit.value[1];
 		}
 		else {
-			clock >>= 16;
+			clock = LOW16(clock);
 		}
-		return((UINT16)clock);
+		return(clock);
 #endif
 	}
 	clock = nevent_getremain(NEVENT_ITIMER + ch);
 	if (clock >= 0) {
-		return((UINT16)(clock / pc.multiple));
+		return(clock / pccore.multiple);
 	}
 	return(0);
 }
 
-void itimer_setflag(int ch, BYTE value) {
+void pit_setflag(int ch, REG8 value) {
 
 	pit.flag[ch] = 0;
 	if (value & 0x30) {
-		pit.mode[ch] = value;
+		pit.mode[ch] = (UINT8)value;
 	}
 	else {														// latch
 		pit.mode[ch] &= ~0x30;
-		pit.latch[ch] = itimer_latch(ch);
+		pit.latch[ch] = (UINT16)pit_latch(ch);
 	}
 }
 
-BOOL itimer_setcount(int ch, BYTE value) {
+BOOL pit_setcount(int ch, REG8 value) {
 
 	switch(pit.mode[ch] & 0x30) {
 		case 0x10:		// access low
@@ -223,30 +214,29 @@ BOOL itimer_setcount(int ch, BYTE value)
 	return(FALSE);
 }
 
-BYTE itimer_getcount(int ch) {
+REG8 pit_getcount(int ch) {
 
-	BYTE	ret;
-	UINT16	w;
+	REG8	ret;
+	REG16	w;
 
 	if (!(pit.mode[ch] & 0x30)) {
 		w = pit.latch[ch];
 	}
 	else {
-		w = itimer_latch(ch);
+		w = pit_latch(ch);
 	}
 	switch(pit.mode[ch] & 0x30) {
 		case 0x10:						// access low
-			return((BYTE)w);
+			return((UINT8)w);
 
 		case 0x20:						// access high
-			return((BYTE)(w >> 8));
+			return((UINT8)(w >> 8));
 	}
-										// access word
-	if (!(pit.flag[ch] & 1)) {
-		ret = (BYTE)w;
+	if (!(pit.flag[ch] & 1)) {			// access word
+		ret = (UINT8)w;
 	}
 	else {
-		ret = (BYTE)(w >> 8);
+		ret = (UINT8)(w >> 8);
 	}
 	pit.flag[ch] ^= 1;
 	return(ret);
@@ -256,10 +246,10 @@ BYTE itimer_getcount(int ch) {
 // ---- I/O
 
 // system timer
-static void IOOUTCALL pit_o71(UINT port, BYTE dat) {
+static void IOOUTCALL pit_o71(UINT port, REG8 dat) {
 
-//	TRACEOUT(("pic o71: %x [%.4x %.4x]", dat, I286_CS, I286_IP));
-	if (itimer_setcount(0, dat)) {
+//	TRACEOUT(("pic o71: %x", dat));
+	if (pit_setcount(0, dat)) {
 		return;
 	}
 	pic.pi[0].irr &= (~1);
@@ -269,9 +259,9 @@ static void IOOUTCALL pit_o71(UINT port,
 }
 
 // beep
-static void IOOUTCALL pit_o73(UINT port, BYTE dat) {
+static void IOOUTCALL pit_o73(UINT port, REG8 dat) {
 
-	if (itimer_setcount(1, dat)) {
+	if (pit_setcount(1, dat)) {
 		return;
 	}
 	setbeepevent(NEVENT_ABSOLUTE);
@@ -285,9 +275,9 @@ static void IOOUTCALL pit_o73(UINT port,
 }
 
 // rs-232c
-static void IOOUTCALL pit_o75(UINT port, BYTE dat) {
+static void IOOUTCALL pit_o75(UINT port, REG8 dat) {
 
-	if (itimer_setcount(2, dat)) {
+	if (pit_setcount(2, dat)) {
 		return;
 	}
 	rs232c_open();
@@ -296,14 +286,14 @@ static void IOOUTCALL pit_o75(UINT port,
 }
 
 // ctrl
-static void IOOUTCALL pit_o77(UINT port, BYTE dat) {
+static void IOOUTCALL pit_o77(UINT port, REG8 dat) {
 
 	int		ch;
 
 //	TRACEOUT(("pic o77: %x", dat));
 	ch = (dat >> 6) & 3;
 	if (ch != 3) {
-		itimer_setflag(ch, dat);
+		pit_setflag(ch, dat);
 		if (ch == 0) {			// 書込みで itimerのirrがリセットされる…
 			pic.pi[0].irr &= (~1);
 			if (dat & 0x30) {	// 一応ラッチ時は割り込みをセットしない
@@ -315,12 +305,38 @@ static void IOOUTCALL pit_o77(UINT port,
 			beep_modeset();
 		}
 	}
+#if defined(uPD71054)
+	else {
+		// これ現状じゃだめぽ＿|￣|○ ver0.76に回す…
+		TRACEOUT(("multiple latch commands - %x", dat));
+		for (ch=0; ch<3; ch++) {
+			if (dat & (2 << ch)) {
+				if (!(dat & 0x10)) {
+				}
+				if (!(dat & 0x20)) {
+				}
+			}
+		}
+	}
+#endif
 	(void)port;
 }
 
-static BYTE IOINPCALL pit_i71(UINT port) {
+static REG8 IOINPCALL pit_i71(UINT port) {
 
-	return(itimer_getcount((port >> 1) & 3));
+	int		ch;
+
+	ch = (port >> 1) & 3;
+#if defined(uPD71054)
+	if (pit.stat[ch]) {
+		REG8 ret;
+		ret = pit.stat[ch];
+		pit.stat[ch] = 0;
+		TRACEOUT(("stat out -> %d-%x", ch, ret));
+		return(ret);
+	}
+#endif
+	return(pit_getcount(ch));
 }
 
 
@@ -335,12 +351,13 @@ static const IOINP piti71[4] = {
 void itimer_reset(void) {
 
 	ZeroMemory(&pit, sizeof(pit));
-	if (pc.cpumode & CPUMODE_8MHz) {
+	if (pccore.cpumode & CPUMODE_8MHZ) {
 		pit.value[1] = 998;				// 4MHz
 	}
 	else {
 		pit.value[1] = 1229;			// 5MHz
 	}
+	pit.intr[0] = 1;
 	pit.mode[0] = 0x30;
 	pit.mode[1] = 0x56;
 	pit.mode[2] = 0xb6;
@@ -353,8 +370,12 @@ void itimer_bind(void) {
 
 	iocore_attachsysoutex(0x0071, 0x0cf1, pito71, 4);
 	iocore_attachsysinpex(0x0071, 0x0cf1, piti71, 4);
+	iocore_attachout(0x3fd9, pit_o71);
 	iocore_attachout(0x3fdb, pit_o73);
+	iocore_attachout(0x3fdd, pit_o75);
 	iocore_attachout(0x3fdf, pit_o77);
+	iocore_attachinp(0x3fd9, pit_i71);
 	iocore_attachinp(0x3fdb, pit_i71);
+	iocore_attachinp(0x3fdd, pit_i71);
 }