--- np2/sound/cs4231g.c 2003/10/16 17:58:08 1.1.1.1 +++ np2/sound/cs4231g.c 2003/11/29 00:36:00 1.3 @@ -6,6 +6,9 @@ #include "fmboard.h" +extern CS4231CFG cs4231cfg; + + // ---- 補完くらいしようよ… BYTE cs4231_nodecode(void) { @@ -29,14 +32,14 @@ static BYTE cs4231_pcm8s(void) { addr = dmac.dmach[0].adrs.d; do { while(ctime < cs4231.step) { - ctime += opna_rate; + ctime += cs4231cfg.rate; leng -= 2; if (leng < 0) { leng = 0; goto p8s_stop; } - cs4231.pcmdata[0] = (i286_memoryread(addr+0) ^ 0x80) << 8; - cs4231.pcmdata[1] = (i286_memoryread(addr+1) ^ 0x80) << 8; + cs4231.pcmdata[0] = (i286_memoryread(addr + 0) ^ 0x80) << 8; + cs4231.pcmdata[1] = (i286_memoryread(addr + 1) ^ 0x80) << 8; addr += 2; } ctime -= cs4231.step; @@ -72,7 +75,7 @@ static BYTE cs4231_pcm8m(void) { addr = dmac.dmach[0].adrs.d; do { while(ctime < cs4231.step) { - ctime += opna_rate; + ctime += cs4231cfg.rate; leng -= 1; if (leng < 0) { leng = 0; @@ -117,7 +120,7 @@ static BYTE cs4231_pcm16s(void) { // TRACEOUT(("addr: %x", addr)); do { while(ctime < cs4231.step) { - ctime += opna_rate; + ctime += cs4231cfg.rate; leng -= 4; if (leng < 0) { leng = 0; @@ -162,7 +165,7 @@ static BYTE cs4231_pcm16m(void) { addr = dmac.dmach[0].adrs.d; do { while(ctime < cs4231.step) { - ctime += opna_rate; + ctime += cs4231cfg.rate; leng -= 2; if (leng < 0) { leng = 0;