--- np2/io/dmac.h	2004/01/22 01:10:04	1.4
+++ np2/io/dmac.h	2007/11/03 00:00:20	1.10
@@ -12,10 +12,11 @@ enum {
 	DMA_INITSIGNALONLY	= 1,
 
 	DMADEV_NONE			= 0,
-	DMADEV_FDD			= 1,
-	DMADEV_SASI			= 2,
-	DMADEV_SCSI			= 3,
-	DMADEV_CS4231		= 4
+	DMADEV_2HD			= 1,
+	DMADEV_2DD			= 2,
+	DMADEV_SASI			= 3,
+	DMADEV_SCSI			= 4,
+	DMADEV_CS4231		= 5
 };
 
 #if defined(BYTESEX_LITTLE)
@@ -42,23 +43,24 @@ typedef struct {
 
 typedef struct {
 	union {
-		BYTE	b[4];
+		UINT8	b[4];
 		UINT16	w[2];
 		UINT32	d;
 	} adrs;
 	union {
-		BYTE	b[2];
+		UINT8	b[2];
 		UINT16	w;
 	} leng;
 	union {
-		BYTE	b[2];
+		UINT8	b[2];
 		UINT16	w;
 	} adrsorg;
 	union {
-		BYTE	b[2];
+		UINT8	b[2];
 		UINT16	w;
 	} lengorg;
-	UINT16	action;
+	UINT8	bound;
+	UINT8	action;
 	DMAPROC	proc;
 	UINT8	mode;
 	UINT8	sreq;
@@ -91,10 +93,12 @@ void DMACCALL dma_dummyout(REG8 data);
 REG8 DMACCALL dma_dummyin(void);
 REG8 DMACCALL dma_dummyproc(REG8 func);
 
-void dmac_reset(void);
+void dmac_reset(const NP2CFG *pConfig);
 void dmac_bind(void);
+void dmac_extbind(void);
 
 void dmac_check(void);
+UINT dmac_getdatas(DMACH dmach, UINT8 *buf, UINT size);
 
 void dmac_procset(void);
 void dmac_attach(REG8 device, REG8 channel);