--- np2/io/dmac.c	2004/07/01 11:42:54	1.11
+++ np2/io/dmac.c	2007/11/03 00:00:20	1.13
@@ -79,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;
@@ -252,13 +252,15 @@ static const IOOUT dmaco21[8] = {
 					dmac_o21,	dmac_o21,	dmac_o21,	dmac_o21,
 					dmac_o29,	NULL,		NULL,		NULL};
 
-void dmac_reset(void) {
+void dmac_reset(const NP2CFG *pConfig) {
 
 	ZeroMemory(&dmac, sizeof(dmac));
 	dmac.lh = DMA16_LOW;
 	dmac.mask = 0xf;
 	dmac_procset();
 //	TRACEOUT(("sizeof(_DMACH) = %d", sizeof(_DMACH)));
+
+	(void)pConfig;
 }
 
 void dmac_bind(void) {
@@ -286,7 +288,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));
@@ -306,7 +308,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++;