--- np2/cbus/board26k.c 2003/12/08 00:55:30 1.5 +++ np2/cbus/board26k.c 2005/05/12 17:24:05 1.8 @@ -63,7 +63,11 @@ static REG8 IOINPCALL opn_i18a(UINT port return(psggen_getreg(&psg1, opn.opnreg)); } (void)port; +#if 1 + return(opn.opnreg); +#else return(0xff); +#endif } @@ -80,12 +84,14 @@ void board26k_reset(void) { opngen_setcfg(3, 0); fmtimer_reset(np2cfg.snd26opt & 0xc0); - soundrom_loadex(np2cfg.snd26opt & 7, "26"); + soundrom_loadex(np2cfg.snd26opt & 7, OEMTEXT("26")); opn.base = (np2cfg.snd26opt & 0x10)?0x000:0x100; } void board26k_bind(void) { + fmboard_fmrestore(0, 0); + psggen_restore(&psg1); sound_streamregist(&opngen, (SOUNDCB)opngen_getpcm); sound_streamregist(&psg1, (SOUNDCB)psggen_getpcm); cbuscore_attachsndex(0x188 - opn.base, opn_o, opn_i);