--- np2/sound/cs4231g.c	2003/12/08 00:55:33	1.4
+++ np2/sound/cs4231g.c	2005/02/07 14:46:12	1.8
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
@@ -9,226 +9,211 @@
 extern	CS4231CFG	cs4231cfg;
 
 
-// ---- 補完くらいしようよ…
+static void SOUNDCALL pcm8m(CS4231 cs, SINT32 *pcm, UINT count) {
 
-REG8 cs4231_nodecode(void) {
-
-	return(0);
-}
-
-static REG8 cs4231_pcm8s(void) {
-
-	SINT32	leng;
-	UINT	indatas;
-	UINT32	addr;
-	UINT32	ctime;
-	UINT	wpos;
-
-	leng = dmac.dmach[0].leng.w;
-	if ((leng >= 2) && (cs4231.bufsize < CS4231_BUFFERS)) {
-		indatas = cs4231.bufsize;
-		ctime = cs4231.curtime;
-		wpos = cs4231.writepos;
-		addr = dmac.dmach[0].adrs.d;
-		do {
-			while(ctime < cs4231.step) {
-				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;
-				addr += 2;
-			}
-			ctime -= cs4231.step;
-			*(UINT32 *)(cs4231.buffer + wpos) = *(UINT32 *)cs4231.pcmdata,
-			wpos = (wpos + 4) & (CS4231_BUFBYTES - 1);
-			indatas++;
-		} while(indatas < CS4231_BUFFERS);
-
-p8s_stop:
-		dmac.dmach[0].leng.w = leng;
-		dmac.dmach[0].adrs.d = addr;
-		cs4231.bufsize = indatas;
-		cs4231.curtime = ctime;
-		cs4231.writepos = wpos;
+	UINT	leng;
+	UINT32	pos12;
+	SINT32	fract;
+	UINT	samppos;
+const UINT8	*ptr1;
+const UINT8	*ptr2;
+	SINT32	samp1;
+	SINT32	samp2;
+
+	leng = cs->bufdatas >> 0;
+	if (!leng) {
+		return;
 	}
-	return((leng < 2)?1:0);
-}
-
-static REG8 cs4231_pcm8m(void) {
-
-	SINT32	leng;
-	UINT	indatas;
-	UINT32	addr;
-	UINT32	ctime;
-	UINT	wpos;
-	SINT16	pcmdata;
-
-	leng = dmac.dmach[0].leng.w;
-	if ((leng > 0) && (cs4231.bufsize < CS4231_BUFFERS)) {
-		indatas = cs4231.bufsize;
-		ctime = cs4231.curtime;
-		wpos = cs4231.writepos;
-		addr = dmac.dmach[0].adrs.d;
-		do {
-			while(ctime < cs4231.step) {
-				ctime += cs4231cfg.rate;
-				leng -= 1;
-				if (leng < 0) {
-					leng = 0;
-					goto p8m_stop;
-				}
-				pcmdata = (i286_memoryread(addr) ^ 0x80) << 8;
-				cs4231.pcmdata[0] = pcmdata;
-				cs4231.pcmdata[1] = pcmdata;
-				addr += 1;
-			}
-			ctime -= cs4231.step;
-			*(UINT32 *)(cs4231.buffer + wpos) = *(UINT32 *)cs4231.pcmdata,
-			wpos = (wpos + 4) & (CS4231_BUFBYTES - 1);
-			indatas++;
-		} while(indatas < CS4231_BUFFERS);
-
-p8m_stop:
-		dmac.dmach[0].leng.w = leng;
-		dmac.dmach[0].adrs.d = addr;
-		cs4231.bufsize = indatas;
-		cs4231.curtime = ctime;
-		cs4231.writepos = wpos;
+	pos12 = cs->pos12;
+	do {
+		samppos = pos12 >> 12;
+		if (leng <= samppos) {
+			break;
+		}
+		fract = pos12 & ((1 << 12) - 1);
+		ptr1 = cs->buffer +
+						((cs->bufpos + (samppos << 0) + 0) & CS4231_BUFMASK);
+		ptr2 = cs->buffer +
+						((cs->bufpos + (samppos << 0) + 1) & CS4231_BUFMASK);
+		samp1 = (ptr1[0] - 0x80) << 8;
+		samp2 = (ptr2[0] - 0x80) << 8;
+		samp1 += ((samp2 - samp1) * fract) >> 12;
+		pcm[0] += samp1;
+		pcm[1] += samp1;
+		pcm += 2;
+		pos12 += cs->step12;
+	} while(--count);
+
+	leng = min(leng, (pos12 >> 12));
+	cs->bufdatas -= (leng << 0);
+	cs->bufpos += (leng << 0);
+	cs->pos12 = pos12 & ((1 << 12) - 1);
+}
+
+static void SOUNDCALL pcm8s(CS4231 cs, SINT32 *pcm, UINT count) {
+
+	UINT	leng;
+	UINT32	pos12;
+	SINT32	fract;
+	UINT	samppos;
+const UINT8	*ptr1;
+const UINT8	*ptr2;
+	SINT32	samp1;
+	SINT32	samp2;
+
+	leng = cs->bufdatas >> 1;
+	if (!leng) {
+		return;
 	}
-	return((leng == 0)?1:0);
-}
-
-static REG8 cs4231_pcm16s(void) {
-
-	SINT32	leng;
-	UINT	indatas;
-	UINT32	addr;
-	UINT32	ctime;
-	UINT	wpos;
-	UINT16	samp;
-
-	leng = dmac.dmach[0].leng.w;
-	if ((leng >= 4) && (cs4231.bufsize < CS4231_BUFFERS)) {
-		indatas = cs4231.bufsize;
-		ctime = cs4231.curtime;
-		wpos = cs4231.writepos;
-		addr = dmac.dmach[0].adrs.d;
-// TRACEOUT(("addr: %x", addr));
-		do {
-			while(ctime < cs4231.step) {
-				ctime += cs4231cfg.rate;
-				leng -= 4;
-				if (leng < 0) {
-					leng = 0;
-					goto p16s_stop;
-				}
-				samp = i286_memoryread_w(addr+0);
-				cs4231.pcmdata[0] = (SINT16)((samp << 8) + (samp >> 8));
-				samp = i286_memoryread_w(addr+2);
-				cs4231.pcmdata[1] = (SINT16)((samp << 8) + (samp >> 8));
-				addr += 4;
-			}
-			ctime -= cs4231.step;
-			*(UINT32 *)(cs4231.buffer + wpos) = *(UINT32 *)cs4231.pcmdata,
-			wpos = (wpos + 4) & (CS4231_BUFBYTES - 1);
-			indatas++;
-		} while(indatas < CS4231_BUFFERS);
-
-p16s_stop:
-		dmac.dmach[0].leng.w = leng;
-		dmac.dmach[0].adrs.d = addr;
-		cs4231.bufsize = indatas;
-		cs4231.curtime = ctime;
-		cs4231.writepos = wpos;
+	pos12 = cs->pos12;
+	do {
+		samppos = pos12 >> 12;
+		if (leng <= samppos) {
+			break;
+		}
+		fract = pos12 & ((1 << 12) - 1);
+		ptr1 = cs->buffer +
+						((cs->bufpos + (samppos << 1) + 0) & CS4231_BUFMASK);
+		ptr2 = cs->buffer +
+						((cs->bufpos + (samppos << 1) + 2) & CS4231_BUFMASK);
+		samp1 = (ptr1[0] - 0x80) << 8;
+		samp2 = (ptr2[0] - 0x80) << 8;
+		samp1 += ((samp2 - samp1) * fract) >> 12;
+		pcm[0] += samp1;
+		samp1 = (ptr1[1] - 0x80) << 8;
+		samp2 = (ptr2[1] - 0x80) << 8;
+		samp1 += ((samp2 - samp1) * fract) >> 12;
+		pcm[1] += samp1;
+		pcm += 2;
+		pos12 += cs->step12;
+	} while(--count);
+
+	leng = min(leng, (pos12 >> 12));
+	cs->bufdatas -= (leng << 1);
+	cs->bufpos += (leng << 1);
+	cs->pos12 = pos12 & ((1 << 12) - 1);
+}
+
+static void SOUNDCALL pcm16m(CS4231 cs, SINT32 *pcm, UINT count) {
+
+	UINT	leng;
+	UINT32	pos12;
+	SINT32	fract;
+	UINT	samppos;
+const UINT8	*ptr1;
+const UINT8	*ptr2;
+	SINT32	samp1;
+	SINT32	samp2;
+
+	leng = cs->bufdatas >> 1;
+	if (!leng) {
+		return;
 	}
-	return((leng < 4)?1:0);
-}
-
-static REG8 cs4231_pcm16m(void) {
-
-	SINT32	leng;
-	UINT	indatas;
-	UINT32	addr;
-	UINT32	ctime;
-	UINT	wpos;
-	UINT16	samp;
-
-	leng = dmac.dmach[0].leng.w;
-	if ((leng >= 2) && (cs4231.bufsize < CS4231_BUFFERS)) {
-		indatas = cs4231.bufsize;
-		ctime = cs4231.curtime;
-		wpos = cs4231.writepos;
-		addr = dmac.dmach[0].adrs.d;
-		do {
-			while(ctime < cs4231.step) {
-				ctime += cs4231cfg.rate;
-				leng -= 2;
-				if (leng < 0) {
-					leng = 0;
-					goto p16m_stop;
-				}
-				samp = i286_memoryread_w(addr);
-				samp = (UINT16)((samp << 8) + (samp >> 8));
-				cs4231.pcmdata[0] = (SINT16)samp;
-				cs4231.pcmdata[1] = (SINT16)samp;
-				addr += 2;
-			}
-			ctime -= cs4231.step;
-			*(UINT32 *)(cs4231.buffer + wpos) = *(UINT32 *)cs4231.pcmdata,
-			wpos = (wpos + 4) & (CS4231_BUFBYTES - 1);
-			indatas++;
-		} while(indatas < CS4231_BUFFERS);
-
-p16m_stop:
-		dmac.dmach[0].leng.w = leng;
-		dmac.dmach[0].adrs.d = addr;
-		cs4231.bufsize = indatas;
-		cs4231.curtime = ctime;
-		cs4231.writepos = wpos;
+	pos12 = cs->pos12;
+	do {
+		samppos = pos12 >> 12;
+		if (leng <= samppos) {
+			break;
+		}
+		fract = pos12 & ((1 << 12) - 1);
+		ptr1 = cs->buffer +
+						((cs->bufpos + (samppos << 1) + 0) & CS4231_BUFMASK);
+		ptr2 = cs->buffer +
+						((cs->bufpos + (samppos << 1) + 2) & CS4231_BUFMASK);
+		samp1 = (((SINT8)ptr1[0]) << 8) + ptr1[1];
+		samp2 = (((SINT8)ptr2[0]) << 8) + ptr2[1];
+		samp1 += ((samp2 - samp1) * fract) >> 12;
+		pcm[0] += samp1;
+		pcm[1] += samp1;
+		pcm += 2;
+		pos12 += cs->step12;
+	} while(--count);
+
+	leng = min(leng, (pos12 >> 12));
+	cs->bufdatas -= (leng << 1);
+	cs->bufpos += (leng << 1);
+	cs->pos12 = pos12 & ((1 << 12) - 1);
+}
+
+static void SOUNDCALL pcm16s(CS4231 cs, SINT32 *pcm, UINT count) {
+
+	UINT	leng;
+	UINT32	pos12;
+	SINT32	fract;
+	UINT	samppos;
+const UINT8	*ptr1;
+const UINT8	*ptr2;
+	SINT32	samp1;
+	SINT32	samp2;
+
+	leng = cs->bufdatas >> 2;
+	if (!leng) {
+		return;
 	}
-	return((leng < 2)?1:0);
+	pos12 = cs->pos12;
+	do {
+		samppos = pos12 >> 12;
+		if (leng <= samppos) {
+			break;
+		}
+		fract = pos12 & ((1 << 12) - 1);
+		ptr1 = cs->buffer +
+						((cs->bufpos + (samppos << 2) + 0) & CS4231_BUFMASK);
+		ptr2 = cs->buffer +
+						((cs->bufpos + (samppos << 2) + 4) & CS4231_BUFMASK);
+		samp1 = (((SINT8)ptr1[0]) << 8) + ptr1[1];
+		samp2 = (((SINT8)ptr2[0]) << 8) + ptr2[1];
+		samp1 += ((samp2 - samp1) * fract) >> 12;
+		pcm[0] += samp1;
+		samp1 = (((SINT8)ptr1[2]) << 8) + ptr1[3];
+		samp2 = (((SINT8)ptr2[2]) << 8) + ptr2[3];
+		samp1 += ((samp2 - samp1) * fract) >> 12;
+		pcm[1] += samp1;
+		pcm += 2;
+		pos12 += cs->step12;
+	} while(--count);
+
+	leng = min(leng, (pos12 >> 12));
+	cs->bufdatas -= (leng << 2);
+	cs->bufpos += (leng << 2);
+	cs->pos12 = pos12 & ((1 << 12) - 1);
+}
+
+static void SOUNDCALL nomake(CS4231 cs, SINT32 *pcm, UINT count) {
+
+	(void)cs;
+	(void)pcm;
+	(void)count;
 }
 
-const CS4231DMA cs4231dec[16] = {
-			cs4231_pcm8m,		// 0: 8bit PCM
-			cs4231_pcm8s,
-			cs4231_nodecode,	// 1: u-Law
-			cs4231_nodecode,
-			cs4231_nodecode,	// 2:
-			cs4231_nodecode,
-			cs4231_nodecode,	// 3: A-law
-			cs4231_nodecode,
-			cs4231_nodecode,	// 4:
-			cs4231_nodecode,
-			cs4231_nodecode,	// 5: ADPCM
-			cs4231_nodecode,
-			cs4231_pcm16m,		// 6: 16bit PCM
-			cs4231_pcm16s,
-			cs4231_nodecode,	// 7: ADPCM
-			cs4231_nodecode};
+
+typedef void (SOUNDCALL * CS4231FN)(CS4231 cs, SINT32 *pcm, UINT count);
+
+static const CS4231FN cs4231fn[16] = {
+			pcm8m,		// 0: 8bit PCM
+			pcm8s,
+			nomake,		// 1: u-Law
+			nomake,
+			nomake,		// 2:
+			nomake,
+			nomake,		// 3: A-Law
+			nomake,
+			nomake,		// 4:
+			nomake,
+			nomake,		// 5: ADPCM
+			nomake,
+			pcm16m,		// 6: 16bit PCM
+			pcm16s,
+			nomake,		// 7: ADPCM
+			nomake};
 
 
 // ----
 
 void SOUNDCALL cs4231_getpcm(CS4231 cs, SINT32 *pcm, UINT count) {
 
-	UINT	pos;
-
-	count = min(count, cs->bufsize);
-	if (count) {
-		cs->bufsize -= count;
-		pos = cs->readpos;
-		do {
-			pcm[0] += (*(SINT16 *)(cs->buffer + pos + 0)) >> 1;
-			pcm[1] += (*(SINT16 *)(cs->buffer + pos + 2)) >> 1;
-			pcm += 2;
-			pos = (pos + 4) & (CS4231_BUFBYTES - 1);
-		} while(--count);
-		cs->readpos = pos;
+	if ((cs->reg.iface & 1) && (count)) {
+		(*cs4231fn[cs->reg.datafmt >> 4])(cs, pcm, count);
 	}
 }