--- xmil/io/ctc.c	2004/08/11 13:53:53	1.6
+++ xmil/io/ctc.c	2004/08/18 08:08:13	1.16
@@ -6,6 +6,33 @@
 #include	"ievent.h"
 
 
+static SINT32 minclock(const CTCCH *ch) {
+
+	UINT32	event;
+	UINT	i;
+	UINT32	clock;
+
+	event = 0x01000000;
+	for (i=0; i<3; i++) {
+		if ((ch->s.cmd[i] & 0x82) == 0x80) {
+			clock = ch->s.count[i];
+			event = min(event, clock);
+		}
+	}
+	if ((ch->s.cmd[3] & 0x82) == 0x80) {
+		clock = ch->s.count[3];
+		if (ch->s.cmd[3] & 0x40) {
+			clock = (clock - 1) * ch->s.countmax[0];
+			clock += ch->s.count[0];
+		}
+		event = min(event, clock);
+	}
+	if (event == 0) {
+		event = 1;
+	}
+	return(event);
+}
+
 static REG8 ctcwork(CTCCH *ch) {
 
 	UINT32	baseclock;
@@ -16,72 +43,63 @@ static REG8 ctcwork(CTCCH *ch) {
 	SINT32	count;
 
 	baseclock = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
-	stepclock = baseclock - ch->baseclock;
+	stepclock = baseclock - ch->s.baseclock;
 	stepclock /= pccore.multiple;
-	ch->baseclock += stepclock * pccore.multiple;
+	ch->s.baseclock += stepclock * pccore.multiple;
 
 	intr = 0;
 	pulse3 = 0;
 
 	// 0
-	if (!(ch->cmd[0] & 0x02)) {
-		pulse = stepclock;					// 2MHz
-		if (!(ch->cmd[0] & 0x40)) {
-			pulse = pulse * 2;				// 4MHz
-		}
-		count = ch->count[0];
+	if (!(ch->s.cmd[0] & 0x02)) {
+		pulse = stepclock;
+		count = ch->s.count[0];
 		count -= pulse;
 		if (count <= 0) {
-			pulse3 = (0 - count) / ch->countmax[0];
+			pulse3 = (0 - count) / ch->s.countmax[0];
 			pulse3 += 1;
-			count += pulse3 * ch->countmax[0];
-			intr |= (ch->cmd[0] & 0x80) >> (7 - 0);
+			count += pulse3 * ch->s.countmax[0];
+			intr |= (ch->s.cmd[0] & 0x80) >> (7 - 0);
 		}
-		ch->count[0] = count;
+		ch->s.count[0] = count;
 	}
 
 	// 3
-	if (!(ch->cmd[3] & 0x02)) {
-		if (!(ch->cmd[3] & 0x40)) {
-			pulse3 = stepclock * 2;				// 4MHz
+	if (!(ch->s.cmd[3] & 0x02)) {
+		if (!(ch->s.cmd[3] & 0x40)) {
+			pulse3 = stepclock;
 		}
-		count = ch->count[3];
+		count = ch->s.count[3];
 		count -= pulse3;
 		if (count <= 0) {
-			count = ch->countmax[3] - ((0 - count) % ch->countmax[3]);
-			intr |= (ch->cmd[3] & 0x80) >> (7 - 3);
+			count = ch->s.countmax[3] - ((0 - count) % ch->s.countmax[3]);
+			intr |= (ch->s.cmd[3] & 0x80) >> (7 - 3);
 		}
-		ch->count[3] = count;
+		ch->s.count[3] = count;
 	}
 
 	// 1
-	if (!(ch->cmd[1] & 0x02)) {
-		pulse = stepclock;					// 2MHz
-		if (!(ch->cmd[1] & 0x40)) {
-			pulse = pulse * 2;				// 4MHz
-		}
-		count = ch->count[1];
+	if (!(ch->s.cmd[1] & 0x02)) {
+		pulse = stepclock;
+		count = ch->s.count[1];
 		count -= pulse;
 		if (count <= 0) {
-			count = ch->countmax[1] - ((0 - count) % ch->countmax[1]);
-			intr |= (ch->cmd[1] & 0x80) >> (7 - 1);
+			count = ch->s.countmax[1] - ((0 - count) % ch->s.countmax[1]);
+			intr |= (ch->s.cmd[1] & 0x80) >> (7 - 1);
 		}
-		ch->count[1] = count;
+		ch->s.count[1] = count;
 	}
 
 	// 2
-	if (!(ch->cmd[2] & 0x02)) {
-		pulse = stepclock;					// 2MHz
-		if (!(ch->cmd[2] & 0x40)) {
-			pulse = pulse * 2;				// 4MHz
-		}
-		count = ch->count[2];
+	if (!(ch->s.cmd[2] & 0x02)) {
+		pulse = stepclock;
+		count = ch->s.count[2];
 		count -= pulse;
 		if (count <= 0) {
-			count = ch->countmax[2] - ((0 - count) % ch->countmax[2]);
-			intr |= (ch->cmd[2] & 0x80) >> (7 - 2);
+			count = ch->s.countmax[2] - ((0 - count) % ch->s.countmax[2]);
+			intr |= (ch->s.cmd[2] & 0x80) >> (7 - 2);
 		}
-		ch->count[2] = count;
+		ch->s.count[2] = count;
 	}
 	return(intr);
 }
@@ -92,44 +110,20 @@ static void ctcstep(CTCCH *ch) {
 
 	intr = ctcwork(ch);
 	if (intr) {
-		ch->intr |= intr;
-		ievent_set(IEVENT_CTC0 + ch->num);
+		ch->s.intr |= intr;
+		ievent_set(IEVENT_CTC0 + ch->s.num);
 	}
 }
 
 static void ctcnextevent(CTCCH *ch) {
 
 	UINT32	event;
-	UINT	i;
-	UINT32	clock;
 
-	if (ch->intr) {
+	if (ch->s.intr) {
 		return;
 	}
-	event = 0x04000000;
-	for (i=0; i<3; i++) {
-		if ((ch->cmd[i] & 0x82) == 0x80) {
-			clock = ch->count[i];
-			if (ch->cmd[i] & 0x40) {
-				clock = clock * 2;
-			}
-			event = min(event, clock);
-		}
-	}
-	if ((ch->cmd[3] & 0x82) == 0x80) {
-		clock = ch->count[3];
-		if (ch->cmd[3] & 0x40) {
-			clock = (clock - 1) * ch->countmax[0];
-			clock += ch->count[0];
-			if (ch->cmd[0] & 0x40) {
-				clock = clock * 2;
-			}
-		}
-		event = min(event, clock);
-	}
-	event /= 2;
-	event *= pccore.multiple;
-	nevent_set(NEVENT_CTC0 + ch->num, event, neitem_ctc, NEVENT_ABSOLUTE);
+	event = minclock(ch) * pccore.multiple;
+	nevent_set(NEVENT_CTC0 + ch->s.num, event, neitem_ctc, NEVENT_ABSOLUTE);
 }
 
 void neitem_ctc(UINT id) {
@@ -140,8 +134,8 @@ void neitem_ctc(UINT id) {
 	ch = ctc.ch + (id - NEVENT_CTC0);
 	intr = ctcwork(ch);
 	if (intr) {
-		ch->intr |= intr;
-		ievent_set(IEVENT_CTC0 + ch->num);
+		ch->s.intr |= intr;
+		ievent_set(IEVENT_CTC0 + ch->s.num);
 	}
 	else {
 		ctcnextevent(ch);
@@ -158,35 +152,29 @@ BRESULT ieitem_ctc(UINT id) {
 
 	ch = ctc.ch + (id - IEVENT_CTC0);
 	intr = ctcwork(ch);
-	intr |= ch->intr;
+	intr |= ch->s.intr;
 	r = FALSE;
 	if (intr) {
-		for (i=0, bit=1; i<4; i++, bit<<=1) {
+		for (i=0, bit=1; i<4; i++, bit<<=1)
+//		for (i=4, bit=8; i--; bit>>=1)
+		{
 			if (intr & bit) {
-#if 1			// アークスのタイミング→あとで修正
-				if (0)
-#elif 0
-				if (((ch->count[i] * 17) >> 4) < ch->countmax[i])
-#else
-				if (ch->count[i] != ch->countmax[i])
-#endif
-				{
-					intr ^= bit;
-				}
-				else if (!(ch->cmd[i] & 0x80)) {
+				if (!(ch->s.cmd[i] & 0x80)) {
 					intr ^= bit;
 				}
 				else if (!r) {
 					r = TRUE;
 					intr ^= bit;
-					Z80_INTERRUPT((REG8)(ch->vector + (i << 1)));
+					ch->s.irq = (UINT8)i;
+//	TRACEOUT(("ctc int %d %d [%.2x]", ch->s.num, i, ch->s.cmd[i]));
+					Z80_INTERRUPT((REG8)(ch->s.vector + (i << 1)));
 				}
 			}
 		}
 	}
-	ch->intr = intr;
+	ch->s.intr = intr;
 	if (intr) {
-		ievent_set(IEVENT_CTC0 + ch->num);
+		ievent_set(IEVENT_CTC0 + ch->s.num);
 	}
 	else {
 		ctcnextevent(ch);
@@ -194,6 +182,31 @@ BRESULT ieitem_ctc(UINT id) {
 	return(r);
 }
 
+void ieeoi_ctc(UINT id) {
+
+	CTCCH	*ch;
+	REG8	intr;
+	UINT	curirq;
+
+	ch = ctc.ch + (id - IEVENT_CTC0);
+	intr = ctcwork(ch) | ch->s.intr;
+	curirq = ch->s.irq;
+	if (intr & (1 << curirq)) {			// 割り込み中に割り込んだ…
+		// カウンタが０でなければ割り込みを消す
+		if ((ch->s.countmax[curirq] - ch->s.count[curirq])
+													>= ch->s.range[curirq]) {
+			intr ^= (1 << curirq);
+		}
+	}
+	ch->s.intr = intr;
+	if (intr) {
+		ievent_set(id);
+	}
+	else {
+		ctcnextevent(ch);
+	}
+}
+
 
 // ----
 
@@ -203,58 +216,45 @@ static void ctcch_o(CTCCH *ch, UINT port
 	REG8	scale;
 
 	port &= 3;
-	if (ch->cmd[port] & 0x04) {
+	if (ch->s.cmd[port] & 0x04) {
 		ctcstep(ch);
-		ch->basecnt[port] = value;
-		count = 256;
-		if (value) {
-			count = (SINT32)value;
-		}
+		ch->s.basecnt[port] = value;
+		count = ((value - 1) & 0xff) + 1;
 		scale = 0;
-		if (!(ch->cmd[port] & 0x40)) {
-			if (ch->cmd[port] & 0x20) {
-				scale = 8;
+		if (!(ch->s.cmd[port] & 0x40)) {
+			if (ch->s.cmd[port] & 0x20) {
+				scale = 8 - 1;
 			}
 			else {
-				scale = 4;
+				scale = 4 - 1;
 			}
 		}
-		count <<= scale;
-		ch->countmax[port] = count;
-		ch->count[port] = count;
-		ch->cmd[port] &= ~6;
+		ch->s.scale[port] = scale;
+		ch->s.countmax[port] = count << scale;
+		ch->s.count[port] = count << scale;
+		ch->s.range[port] = 1 << scale;
+		ch->s.cmd[port] &= ~6;
 		ctcnextevent(ch);
 	}
 	else if (value & 1) {
 		ctcstep(ch);
-		ch->cmd[port] = value;
+		ch->s.cmd[port] = value;
 		ctcnextevent(ch);
 	}
 	else if (!port) {												// ver0.25
-		ch->vector = (UINT8)(value & 0xf8);
+		ch->s.vector = (UINT8)(value & 0xf8);
 	}
 }
 
 static REG8 ctcch_i(CTCCH *ch, UINT port) {
 
-	REG8	scale;
-
 	port &= 3;
 	if (port != 3) {
-		return(ch->basecnt[port]);
+		return(ch->s.basecnt[port]);
 	}
 	else {
 		ctcstep(ch);
-		scale = 0;
-		if (!(ch->cmd[3] & 0x40)) {
-			if (ch->cmd[3] & 0x20) {
-				scale = 8;
-			}
-			else {
-				scale = 4;
-			}
-		}
-		return((REG8)(ch->count[3] >> scale));
+		return((REG8)(ch->s.count[3] >> ch->s.scale[3]));
 	}
 }
 
@@ -265,13 +265,13 @@ static CTCCH *getctcch(UINT port) {
 
 	port &= ~3;
 	if (port == 0x1fa0) {
-		return(ctc.ch + 0);
+		return(ctc.ch + CTC_TURBO1);
 	}
 	if (port == 0x1fa8) {
-		return(ctc.ch + 1);
+		return(ctc.ch + CTC_TURBO2);
 	}
 	if (port == 0x0704) {
-		return(ctc.ch + 2);
+		return(ctc.ch + CTC_OPM);
 	}
 	return(NULL);
 }
@@ -280,7 +280,7 @@ void IOOUTCALL ctc_o(UINT port, REG8 val
 
 	CTCCH	*ch;
 
-//	TRACEOUT(("ctc - %.4x %.2x [%.4x]", port, value, Z80_PC));
+	TRACEOUT(("ctc - %.4x %.2x [%.4x]", port, value, Z80_PC));
 	ch = getctcch(port);
 	if (ch != NULL) {
 		ctcch_o(ch, port, value);
@@ -310,11 +310,12 @@ void ctc_reset(void) {
 
 	ZeroMemory(&ctc, sizeof(ctc));
 	for (i=0; i<3; i++) {
-		ctc.ch[i].num = (UINT8)i;
+		ctc.ch[i].s.num = (UINT8)i;
 		for (j=0; j<4; j++) {
-			ctc.ch[i].cmd[j] = 0x03;
-			ctc.ch[i].count[j] = 256 << 8;
-			ctc.ch[i].countmax[j] = 256 << 8;
+			ctc.ch[i].s.cmd[j] = 0x23;
+			ctc.ch[i].s.scale[j] = 7;
+			ctc.ch[i].s.count[j] = 256 << 7;
+			ctc.ch[i].s.countmax[j] = 256 << 7;
 		}
 	}
 }