--- np2/cbus/board118.c	2003/10/16 17:58:00	1.1
+++ np2/cbus/board118.c	2007/11/03 00:00:19	1.9
@@ -9,26 +9,34 @@
 #include	"s98.h"
 
 
-static void IOOUTCALL ymf_o188(UINT port, BYTE dat) {
+static void IOOUTCALL ymf_o188(UINT port, REG8 dat) {
 
-	opn.opnreg = dat;
+	opn.addr = dat;
+	opn.data = dat;
 	(void)port;
 }
 
-static void IOOUTCALL ymf_o18a(UINT port, BYTE dat) {
+static void IOOUTCALL ymf_o18a(UINT port, REG8 dat) {
 
-	S98_put(NORMAL2608, opn.opnreg, dat);
-	if (opn.opnreg < 0x10) {
-		if (opn.opnreg != 0x0e) {
-			psggen_setreg(&psg1, opn.opnreg, dat);
+	UINT	addr;
+
+	opn.data = dat;
+	addr = opn.addr;
+	if (addr >= 0x100) {
+		return;
+	}
+	S98_put(NORMAL2608, addr, dat);
+	if (addr < 0x10) {
+		if (addr != 0x0e) {
+			psggen_setreg(&psg1, addr, dat);
 		}
 	}
 	else {
-		if (opn.opnreg < 0x20) {
-			rhythm_setreg(&rhythm, opn.opnreg, dat);
+		if (addr < 0x20) {
+			rhythm_setreg(&rhythm, addr, dat);
 		}
-		else if (opn.opnreg < 0x30) {
-			if (opn.opnreg == 0x28) {
+		else if (addr < 0x30) {
+			if (addr == 0x28) {
 				if ((dat & 0x0f) < 3) {
 					opngen_keyon(dat & 0x0f, dat);
 				}
@@ -38,33 +46,45 @@ static void IOOUTCALL ymf_o18a(UINT port
 				}
 			}
 			else {
-				fmtimer_setreg(opn.opnreg, dat);
+				fmtimer_setreg(addr, dat);
 			}
 		}
-		else if (opn.opnreg < 0xc0) {
-			opngen_setreg(0, opn.opnreg, dat);
+		else if (addr < 0xc0) {
+			opngen_setreg(0, addr, dat);
 		}
-		opn.reg[opn.opnreg] = dat;
+		opn.reg[addr] = dat;
 	}
 	(void)port;
 }
 
-static void IOOUTCALL ymf_o18c(UINT port, BYTE dat) {
+static void IOOUTCALL ymf_o18c(UINT port, REG8 dat) {
 
-	opn.extreg = dat;
+	if (opn.extend) {
+		opn.addr = dat + 0x100;
+		opn.data = dat;
+	}
 	(void)port;
 }
 
-static void IOOUTCALL ymf_o18e(UINT port, BYTE dat) {
+static void IOOUTCALL ymf_o18e(UINT port, REG8 dat) {
+
+	UINT	addr;
 
-	S98_put(EXTEND2608, opn.extreg, dat);
-	opn.reg[opn.extreg + 0x100] = dat;
-	if (opn.extreg >= 0x30) {
-		sound_sync();
-		opngen_setreg(3, opn.extreg, dat);
+	if (!opn.extend) {
+		return;
+	}
+	opn.data = dat;
+	addr = opn.addr - 0x100;
+	if (addr >= 0x100) {
+		return;
+	}
+	S98_put(EXTEND2608, addr, dat);
+	opn.reg[addr + 0x100] = dat;
+	if (addr >= 0x30) {
+		opngen_setreg(3, addr, dat);
 	}
 	else {
-		if (opn.extreg == 0x10) {
+		if (addr == 0x10) {
 			if (!(dat & 0x80)) {
 				opn.adpcmmask = ~(dat & 0x1c);
 			}
@@ -73,43 +93,42 @@ static void IOOUTCALL ymf_o18e(UINT port
 	(void)port;
 }
 
-static BYTE IOINPCALL ymf_i188(UINT port) {
+static REG8 IOINPCALL ymf_i188(UINT port) {
 
 	(void)port;
 	return(fmtimer.status);
 }
 
-static BYTE IOINPCALL ymf_i18a(UINT port) {
+static REG8 IOINPCALL ymf_i18a(UINT port) {
+
+	UINT	addr;
 
-	if (opn.opnreg == 0x0e) {
+	addr = opn.addr;
+	if (addr == 0x0e) {
 		return(fmboard_getjoy(&psg1));
 	}
-	else if (opn.opnreg < 0x10) {
-		return(psggen_getreg(&psg1, opn.opnreg));
+	else if (addr < 0x10) {
+		return(psggen_getreg(&psg1, addr));
 	}
-	(void)port;
-	return(opn.reg[opn.opnreg]);
-}
-
-static BYTE IOINPCALL ymf_i18c(UINT port) {
-
-	if (opn.extend) {
-		return(fmtimer.status & 3);
+	else if (addr == 0xff) {
+		return(1);
+	}
+	else {
+		(void)port;
+		return(opn.data);
 	}
-	(void)port;
-	return(0xff);
 }
 
-static BYTE IOINPCALL ymf_i18e(UINT port) {
+static REG8 IOINPCALL ymf_i18c(UINT port) {
 
 	if (opn.extend) {
-		return(opn.reg[opn.opnreg]);
+		return(fmtimer.status & 3);
 	}
 	(void)port;
 	return(0xff);
 }
 
-static void extendchannel(BYTE enable) {
+static void extendchannel(REG8 enable) {
 
 	opn.extend = enable;
 	if (enable) {
@@ -123,14 +142,14 @@ static void extendchannel(BYTE enable) {
 	}
 }
 
-static void IOOUTCALL ymf_oa460(UINT port, BYTE dat) {
+static void IOOUTCALL ymf_oa460(UINT port, REG8 dat) {
 
 	cs4231.extfunc = dat;
-	extendchannel((BYTE)(dat & 1));
+	extendchannel((REG8)(dat & 1));
 	(void)port;
 }
 
-static BYTE IOINPCALL ymf_ia460(UINT port) {
+static REG8 IOINPCALL ymf_ia460(UINT port) {
 
 	(void)port;
 	return(0x80 | (cs4231.extfunc & 1));
@@ -143,23 +162,29 @@ static const IOOUT ymf_o[4] = {
 			ymf_o188,	ymf_o18a,	ymf_o18c,	ymf_o18e};
 
 static const IOINP ymf_i[4] = {
-			ymf_i188,	ymf_i18a,	ymf_i18c,	ymf_i18e};
+			ymf_i188,	ymf_i18a,	ymf_i18c,	NULL};
 
 
-void board118_reset(void) {
+void board118_reset(const NP2CFG *pConfig) {
 
 	fmtimer_reset(0xc0);
 	opngen_setcfg(3, OPN_STEREO | 0x038);
 	cs4231io_reset();
-	soundrom_load(0xcc000, "118");
+	soundrom_load(0xcc000, OEMTEXT("118"));
 	fmboard_extreg(extendchannel);
+
+	(void)pConfig;
 }
 
 void board118_bind(void) {
 
+	fmboard_fmrestore(0, 0);
+	fmboard_fmrestore(3, 1);
+	psggen_restore(&psg1);
+	fmboard_rhyrestore(&rhythm, 0);
 	sound_streamregist(&opngen, (SOUNDCB)opngen_getpcm);
 	sound_streamregist(&psg1, (SOUNDCB)psggen_getpcm);
-	sound_streamregist(&rhythm, (SOUNDCB)rhythm_getpcm);
+	rhythm_bind(&rhythm);
 	cs4231io_bind();
 	cbuscore_attachsndex(0x188, ymf_o, ymf_i);
 	iocore_attachout(0xa460, ymf_oa460);