--- np2/cbus/board14.c 2004/03/19 00:30:00 1.6 +++ np2/cbus/board14.c 2011/01/15 18:04:43 1.9 @@ -15,16 +15,16 @@ UINT board14_pitcount(void) { - SINT32 clock; + SINT32 clk; - clock = nevent_getremain(NEVENT_MUSICGEN); - if (clock >= 0) { - clock /= pccore.multiple; - clock /= 8; + clk = nevent_getremain(NEVENT_MUSICGEN); + if (clk >= 0) { + clk /= pccore.multiple; + clk /= 8; if (!(pccore.cpumode & CPUMODE_8MHZ)) { - clock = clock * 13 / 16; + clk = clk * 13 / 16; } - return(clock); + return(clk); } return(0); } @@ -186,10 +186,12 @@ static const IOINP musicgen_i1[4] = { musicgen_i188, musicgen_i188, musicgen_i18c, musicgen_i18e}; -void board14_reset(void) { +void board14_reset(const NP2CFG *pConfig) { ZeroMemory(&musicgen, sizeof(musicgen)); - soundrom_load(0xcc000, "14"); + soundrom_load(0xcc000, OEMTEXT("14")); + + (void)pConfig; } void board14_bind(void) {