--- np2/sound/pcm86c.c 2003/12/08 00:55:33 1.3 +++ np2/sound/pcm86c.c 2004/01/13 05:30:59 1.4 @@ -42,9 +42,9 @@ void pcm86_reset(void) { // ve pcm86.dactrl = 0x32; pcm86.stepmask = (1 << 2) - 1; pcm86.stepbit = 2; - pcm86.stepclock = (pc.baseclock << 6); + pcm86.stepclock = (pccore.baseclock << 6); pcm86.stepclock /= 44100; - pcm86.stepclock *= pc.multiple; + pcm86.stepclock *= pccore.multiple; pcm86.rescue = (PCM86_RESCUE * 32) << 2; } @@ -59,9 +59,9 @@ void pcm86_setpcmrate(REG8 val) { SINT32 rate; rate = pcm86rate8[val & 7]; - pcm86.stepclock = (pc.baseclock << 6); + pcm86.stepclock = (pccore.baseclock << 6); pcm86.stepclock /= rate; - pcm86.stepclock *= (pc.multiple << 3); + pcm86.stepclock *= (pccore.multiple << 3); if (pcm86cfg.rate) { pcm86.div = (rate << (PCM86_DIVBIT - 3)) / pcm86cfg.rate; pcm86.div2 = (pcm86cfg.rate << (PCM86_DIVBIT + 3)) / rate; @@ -95,9 +95,9 @@ void pcm86_setnextintr(void) { cnt += pcm86.stepmask; cnt >>= pcm86.stepbit; // cnt += 4; // ちょっと延滞させる - // ここで clk = pc.realclock * cnt / 86pcm_rate - // clk = ((pc.baseclock / 86pcm_rate) * cnt) * pc.multiple - if (pc.baseclock == PCBASECLOCK25) { + // ここで clk = pccore.realclock * cnt / 86pcm_rate + // clk = ((pccore.baseclock / 86pcm_rate) * cnt) * pccore.multiple + if (pccore.baseclock == PCBASECLOCK25) { clk = clk25_128[pcm86.fifo & 7]; } else { @@ -107,7 +107,7 @@ void pcm86_setnextintr(void) { clk *= cnt; clk >>= 7; // clk++; // roundup - clk *= pc.multiple; + clk *= pccore.multiple; nevent_set(NEVENT_86PCM, clk, pcm86_cb, NEVENT_ABSOLUTE); } }