--- np2/io/pit.c	2003/10/25 11:37:40	1.2
+++ np2/io/pit.c	2003/12/08 00:55:32	1.10
@@ -3,14 +3,14 @@
 // 
 
 #include	"compiler.h"
-#include	"i286.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
 #include	"beep.h"
 
 
-// #define	uPD71054								// NP2はuPD8253Cベース
+// #define	uPD71054					// NP2はuPD8253Cベース
+#define	BEEPCOUNTEREX					// BEEPアイドル時のカウンタをα倍に
 
 
 // --- Interval timer
@@ -32,7 +32,7 @@ static void setsystimerevent(BOOL absolu
 
 	SINT32	cnt;
 
-	cnt = pit.value[0].w;
+	cnt = pit.value[0];
 	if (cnt > 8) {									// 根拠なし
 		cnt *= pc.multiple;
 	}
@@ -45,25 +45,49 @@ static void setsystimerevent(BOOL absolu
 void systimer(NEVENTITEM item) {
 
 	if (item->flag & NEVENT_SETEVENT) {
+		if (pit.intr[0]) {
+			pit.intr[0] = 0;
+			pic_setirq(0);
+		}
 		if ((pit.mode[0] & 0x0c) == 0x04) {
 			// レートジェネレータ
+			pit.intr[0] = 1;
 			setsystimerevent(NEVENT_RELATIVE);
 		}
 		else {
-			setsystimerevent_noint(NEVENT_RELATIVE);
+			nevent_set(NEVENT_ITIMER, pc.multiple << 16,
+												systimer, NEVENT_RELATIVE);
 		}
 	}
-	pic_setirq(0);
 }
 
 
 // --- Beep
 
+#if defined(BEEPCOUNTEREX)
+static void setbeepeventex(BOOL absolute) {
+
+	UINT32	cnt;
+
+	cnt = pit.value[1];
+	if (cnt > 2) {
+		cnt *= pc.multiple;
+	}
+	else {
+		cnt = pc.multiple << 16;
+	}
+	while(cnt < 0x100000) {
+		cnt <<= 1;
+	}
+	nevent_set(NEVENT_BEEP, (SINT32)cnt, beeponeshot, absolute);
+}
+#endif
+
 static void setbeepevent(BOOL absolute) {
 
 	SINT32	cnt;
 
-	cnt = pit.value[1].w;
+	cnt = pit.value[1];
 	if (cnt > 2) {
 		cnt *= pc.multiple;
 	}
@@ -85,7 +109,11 @@ void beeponeshot(NEVENTITEM item) {
 		if (pit.mode[1] & 0x02)
 #endif
 		{
+#if defined(BEEPCOUNTEREX)
+			setbeepeventex(NEVENT_RELATIVE);
+#else
 			setbeepevent(NEVENT_RELATIVE);
+#endif
 		}
 	}
 }
@@ -97,11 +125,11 @@ static void setrs232cevent(BOOL absolute
 
 	SINT32	cnt;
 
-	if (pit.value[2].w > 1) {
-		cnt = pc.multiple * pit.value[2].w * rs232c.mul;			// ver0.29
+	if (pit.value[2] > 1) {
+		cnt = pc.multiple * pit.value[2] * rs232c.mul;
 	}
 	else {
-		cnt = (pc.multiple << 16) * rs232c.mul;						// ver0.29
+		cnt = (pc.multiple << 16) * rs232c.mul;
 	}
 	nevent_set(NEVENT_RS232C, cnt, rs232ctimer, absolute);
 }
@@ -117,9 +145,10 @@ void rs232ctimer(NEVENTITEM item) {
 	rs232c_callback();
 }
 
+
 // ---------------------------------------------------------------------------
 
-static UINT16 itimer_latch(int ch) {
+static UINT pit_latch(int ch) {
 
 	SINT32	clock;
 
@@ -127,86 +156,95 @@ static UINT16 itimer_latch(int ch) {
 		switch(pit.mode[1] & 0x06) {
 			case 0x00:
 			case 0x04:
-				return(pit.value[1].w);
+				return(pit.value[1]);
 #ifdef uPD71054
 			case 0x06:
-				return(pit.value[1].w & 0xfffe);
+				return(pit.value[1] & (~1));
 #endif
 		}
+#if defined(BEEPCOUNTEREX)
+		clock = nevent_getremain(NEVENT_ITIMER + ch);
+		if (clock < 0) {
+			return(0);
+		}
+		clock /= pc.multiple;
+		if (pit.value[1] > 2) {
+			clock %= pit.value[1];
+		}
+		else {
+			clock >>= 16;
+		}
+		return(clock);
+#endif
 	}
 	clock = nevent_getremain(NEVENT_ITIMER + ch);
 	if (clock >= 0) {
-		return((UINT16)(clock / pc.multiple));
+		return(clock / pc.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].w = 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
-			pit.value[ch].w = value;
+			pit.value[ch] = value;
 			break;
 
 		case 0x20:		// access high
-			pit.value[ch].w = value << 8;
+			pit.value[ch] = value << 8;
 			break;
 
 		case 0x30:		// access word
 			if (!(pit.flag[ch] & 2)) {
-				pit.value[ch].w &= 0xff00;
-				pit.value[ch].w += value;
+				pit.value[ch] &= 0xff00;
+				pit.value[ch] += value;
 				pit.flag[ch] ^= 2;
 				return(TRUE);
 			}
-			pit.value[ch].w &= 0x00ff;
-			pit.value[ch].w += value << 8;
+			pit.value[ch] &= 0x00ff;
+			pit.value[ch] += value << 8;
 			pit.flag[ch] ^= 2;
 			break;
 	}
 	return(FALSE);
 }
 
-BYTE itimer_getcount(int ch) {
+REG8 pit_getcount(int ch) {
 
-	BYTE	ret;
-	union {
-		BYTE	b[2];
-		UINT16	w;
-	} tim;
+	REG8	ret;
+	REG16	w;
 
 	if (!(pit.mode[ch] & 0x30)) {
-		tim.w = pit.latch[ch].w;
+		w = pit.latch[ch];
 	}
 	else {
-		tim.w = itimer_latch(ch);									// ver0.30
+		w = pit_latch(ch);
 	}
 	switch(pit.mode[ch] & 0x30) {
 		case 0x10:						// access low
-			return((BYTE)tim.w);
+			return((UINT8)w);
 
 		case 0x20:						// access high
-			return((BYTE)(tim.w >> 8));
+			return((UINT8)(w >> 8));
 	}
-										// access word
-	if (!(pit.flag[ch] & 1)) {
-		ret = (BYTE)tim.w;
+	if (!(pit.flag[ch] & 1)) {			// access word
+		ret = (UINT8)w;
 	}
 	else {
-		ret = (BYTE)(tim.w >> 8);
+		ret = (UINT8)(w >> 8);
 	}
 	pit.flag[ch] ^= 1;
 	return(ret);
@@ -216,20 +254,21 @@ 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) {
 
-	if (itimer_setcount(0, dat)) {
+	if (pit_setcount(0, dat)) {
 		return;
 	}
 	pic.pi[0].irr &= (~1);
+	pit.intr[0] = 1;
 	setsystimerevent(NEVENT_ABSOLUTE);
 	(void)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);
@@ -237,15 +276,15 @@ static void IOOUTCALL pit_o73(UINT port,
 		beep_lheventset(1);
 	}
 	else {
-		beep_hzset(pit.value[1].w);
+		beep_hzset(pit.value[1]);
 	}
 	(void)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();
@@ -254,15 +293,20 @@ 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) {	// 一応ラッチ時は割り込みをセットしない
+				pit.intr[0] = 1;
+//				setsystimerevent(NEVENT_ABSOLUTE);
+			}
 		}
 		if (ch == 1) {
 			beep_modeset();
@@ -271,9 +315,9 @@ static void IOOUTCALL pit_o77(UINT port,
 	(void)port;
 }
 
-static BYTE IOINPCALL pit_i71(UINT port) {
+static REG8 IOINPCALL pit_i71(UINT port) {
 
-	return(itimer_getcount((port >> 1) & 3));
+	return(pit_getcount((port >> 1) & 3));
 }
 
 
@@ -289,17 +333,17 @@ void itimer_reset(void) {
 
 	ZeroMemory(&pit, sizeof(pit));
 	if (pc.cpumode & CPUMODE_8MHz) {
-		pit.value[1].w = 998;			// 4MHz
+		pit.value[1] = 998;				// 4MHz
 	}
 	else {
-		pit.value[1].w = 1229;			// 5MHz
+		pit.value[1] = 1229;			// 5MHz
 	}
 	pit.mode[0] = 0x30;
 	pit.mode[1] = 0x56;
 	pit.mode[2] = 0xb6;
 	pit.mode[3] = 0x36;
 	setsystimerevent(NEVENT_ABSOLUTE);
-	beep_hzset(pit.value[1].w);
+	beep_hzset(pit.value[1]);
 }
 
 void itimer_bind(void) {