--- np2/io/dmac.c	2004/03/29 14:19:25	1.10
+++ np2/io/dmac.c	2005/02/07 14:46:11	1.12
@@ -33,7 +33,11 @@ static const DMAPROC dmaproc[] = {
 		{dma_dummyout,		dma_dummyin,		dma_dummyproc},		// SASI
 #endif
 		{dma_dummyout,		dma_dummyin,		dma_dummyproc},		// SCSI
+#if !defined(DISABLE_SOUND)
 		{dma_dummyout,		dma_dummyin,		cs4231dmafunc},		// CS4231
+#else
+		{dma_dummyout,		dma_dummyin,		dma_dummyproc},		// SASI
+#endif
 };
 
 
@@ -75,7 +79,7 @@ void dmac_check(void) {
 	}
 }
 
-UINT dmac_getdatas(DMACH dmach, BYTE *buf, UINT size) {
+UINT dmac_getdatas(DMACH dmach, UINT8 *buf, UINT size) {
 
 	UINT	leng;
 	UINT32	addr;
@@ -282,7 +286,7 @@ static void dmacset(REG8 channel) {
 		}
 		dev++;
 	}
-	if (dmadev >= sizeof(dmaproc) / sizeof(DMAPROC)) {
+	if (dmadev >= NELEMENTS(dmaproc)) {
 		dmadev = 0;
 	}
 //	TRACEOUT(("dmac set %d - %d", channel, dmadev));
@@ -302,7 +306,7 @@ void dmac_attach(REG8 device, REG8 chann
 
 	dmac_detach(device);
 
-	if (dmac.devices < (sizeof(dmac.device) / sizeof(DMADEV))) {
+	if (dmac.devices < NELEMENTS(dmac.device)) {
 		dmac.device[dmac.devices].device = device;
 		dmac.device[dmac.devices].channel = channel;
 		dmac.devices++;