--- np2/io/pit.c	2003/12/13 19:59:41	1.12
+++ np2/io/pit.c	2004/03/10 23:01:08	1.18
@@ -3,41 +3,28 @@
 // 
 
 #include	"compiler.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
 #include	"beep.h"
 
 
-// #define	uPD71054					// NP2はuPD8253Cベース
 #define	BEEPCOUNTEREX					// BEEPアイドル時のカウンタをα倍に
 
 
 // --- 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);
 }
@@ -55,7 +42,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);
 		}
 	}
@@ -71,10 +58,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;
@@ -89,10 +76,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);
 }
@@ -103,7 +90,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)
@@ -126,10 +113,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);
 }
@@ -154,7 +141,9 @@ static UINT pit_latch(int ch) {
 
 	if (ch == 1) {
 		switch(pit.mode[1] & 0x06) {
+#ifdef uPD71054				// ?
 			case 0x00:
+#endif
 			case 0x04:
 				return(pit.value[1]);
 #ifdef uPD71054
@@ -167,19 +156,19 @@ static UINT pit_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(clock);
 #endif
 	}
 	clock = nevent_getremain(NEVENT_ITIMER + ch);
 	if (clock >= 0) {
-		return(clock / pc.multiple);
+		return(clock / pccore.multiple);
 	}
 	return(0);
 }
@@ -313,12 +302,37 @@ static void IOOUTCALL pit_o77(UINT port,
 			beep_modeset();
 		}
 	}
+#if defined(uPD71054)
+	else {
+		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 REG8 IOINPCALL pit_i71(UINT port) {
 
-	return(pit_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));
 }
 
 
@@ -333,7 +347,7 @@ 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 {
@@ -352,8 +366,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);
 }