--- np2/sound/cs4231c.c	2003/10/16 17:58:08	1.1
+++ np2/sound/cs4231c.c	2004/01/13 05:30:59	1.7
@@ -1,24 +1,23 @@
 #include	"compiler.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
 #include	"fmboard.h"
 
 
+	CS4231CFG	cs4231cfg;
+
+
 static const UINT16 cs4231samprate[] = {
 					 8000,	 5510,	16000,	11025,
 					27420,	18900,	32000,	22050,
 					54840,	37800,	64000,	44100,
 					48000,	33075,	 9600,	 6620};
 
-static const BYTE dmach[] =  {0xff, 0x00, 0x01, 0x03, 0xff, 0xff, 0xff, 0xff};
-static const BYTE dmairq[] = {0xff, 0x03, 0x06, 0x0a, 0x0c, 0xff, 0xff, 0xff};
-
 
 void cs4231_initialize(UINT rate) {
 
-	(void)rate;
+	cs4231cfg.rate = rate;
 }
 
 void cs4231_setvol(UINT vol) {
@@ -29,33 +28,43 @@ void cs4231_setvol(UINT vol) {
 
 void cs4231_dma(NEVENTITEM item) {
 
-	BYTE	ret;
+	DMACH	dmach;
+	REG8	ret;
 	SINT32	cnt;
 
 	if (item->flag & NEVENT_SETEVENT) {
-		if (dmac.dmach[0].leng.w) {
-			sound_sync();
-			ret = cs4231.proc();
-			if ((ret) && (cs4231.reg.pinctrl & 2)) {
-				dmac.dmach[0].leng.w = 0;
-				cs4231.intflag = 1;
-				pic_setirq(0x0c);
+		if (cs4231.dmach != 0xff) {
+			dmach = dmac.dmach + cs4231.dmach;
+			if (dmach->leng.w) {
+				sound_sync();
+				ret = cs4231.proc(dmach);
+				if ((ret) && (cs4231.reg.pinctrl & 2)) {
+					dmach->leng.w = 0;
+					if (cs4231.dmairq != 0xff) {
+						cs4231.intflag = 1;
+						pic_setirq(cs4231.dmairq);
+					}
+				}
 			}
 		}
-		cnt = pc.realclock * 16 / opna_rate;
-		nevent_set(NEVENT_CS4231, cnt, cs4231_dma, NEVENT_RELATIVE);
+		if (cs4231cfg.rate) {
+			cnt = pccore.realclock * 16 / cs4231cfg.rate;
+			nevent_set(NEVENT_CS4231, cnt, cs4231_dma, NEVENT_RELATIVE);
+		}
 	}
 	(void)item;
 }
 
-BYTE DMACCALL cs4231dmafunc(BYTE func) {
+REG8 DMACCALL cs4231dmafunc(REG8 func) {
 
 	SINT32	cnt;
 
 	switch(func) {
 		case DMAEXT_START:
-			cnt = pc.realclock * 16 / opna_rate;
-			nevent_set(NEVENT_CS4231, cnt, cs4231_dma, NEVENT_ABSOLUTE);
+			if (cs4231cfg.rate) {
+				cnt = pccore.realclock * 16 / cs4231cfg.rate;
+				nevent_set(NEVENT_CS4231, cnt, cs4231_dma, NEVENT_ABSOLUTE);
+			}
 			break;
 
 		case DMAEXT_BREAK:
@@ -78,7 +87,9 @@ void cs4231_update(void) {
 }
 
 
-void cs4231_control(UINT index, BYTE value) {
+void cs4231_control(UINT index, REG8 value) {
+
+	DMACH	dmach;
 
 	*(((BYTE *)(&cs4231.reg)) + index) = value;
 	switch(index) {
@@ -88,13 +99,16 @@ void cs4231_control(UINT index, BYTE val
 			break;
 
 		case 9:
-			if ((value & 0x5) == 0x5) {
-				dmac.dmach[0].ready = 1;
-			}
-			else {
-				dmac.dmach[0].ready = 0;
+			if (cs4231.dmach != 0xff) {
+				dmach = dmac.dmach + cs4231.dmach;
+				if ((value & 0x5) == 0x5) {
+					dmach->ready = 1;
+				}
+				else {
+					dmach->ready = 0;
+				}
+				dmac_check();
 			}
-			dmac_check();
 			break;
 	}
 }