--- np2/io/fdc.c	2003/12/08 00:55:32	1.5
+++ np2/io/fdc.c	2004/01/22 01:10:04	1.7
@@ -8,6 +8,10 @@
 #include	"iocore.h"
 #include	"fddfile.h"
 
+enum {
+	FDC_DMACH2HD	= 2,
+	FDC_DMACH2DD	= 3
+};
 
 static const UINT8 FDCCMD_TABLE[32] = {
 						0, 0, 8, 2, 1, 8, 8, 1, 0, 8, 1, 0, 8, 5, 0, 2,
@@ -56,10 +60,10 @@ REG8 DMACCALL fdc_dmafunc(REG8 func) {
 static void fdc_dmaready(REG8 enable) {
 
 	if (CTRL_FDMEDIA == DISKTYPE_2HD) {
-		dmac.dmach[DMA_2HD].ready = enable;
+		dmac.dmach[FDC_DMACH2HD].ready = enable;
 	}
 	else {
-		dmac.dmach[DMA_2DD].ready = enable;
+		dmac.dmach[FDC_DMACH2DD].ready = enable;
 	}
 }
 
@@ -628,7 +632,7 @@ static void fdcstatusreset(void) {
 	fdc.status = FDCSTAT_RQM;
 }
 
-void DMACCALL fdc_DataRegWrite(REG8 data) {
+void DMACCALL fdc_datawrite(REG8 data) {
 
 //	if ((fdc.status & (FDCSTAT_RQM | FDCSTAT_DIO)) == FDCSTAT_RQM) {
 		switch(fdc.event) {
@@ -667,7 +671,7 @@ void DMACCALL fdc_DataRegWrite(REG8 data
 //	}
 }
 
-REG8 DMACCALL fdc_DataRegRead(void) {
+REG8 DMACCALL fdc_dataread(void) {
 
 //	if ((fdc.status & (FDCSTAT_RQM | FDCSTAT_DIO))
 //									== (FDCSTAT_RQM | FDCSTAT_DIO)) {
@@ -716,7 +720,7 @@ static void IOOUTCALL fdc_o92(UINT port,
 //	TRACEOUT(("fdc out %x %x", port, dat));
 	CTRL_FDMEDIA = DISKTYPE_2HD;
 	if ((fdc.status & (FDCSTAT_RQM | FDCSTAT_DIO)) == FDCSTAT_RQM) {
-		fdc_DataRegWrite(dat);
+		fdc_datawrite(dat);
 	}
 	(void)port;
 }
@@ -750,7 +754,7 @@ static REG8 IOINPCALL fdc_i92(UINT port)
 	CTRL_FDMEDIA = DISKTYPE_2HD;
 	if ((fdc.status & (FDCSTAT_RQM | FDCSTAT_DIO))
 										== (FDCSTAT_RQM | FDCSTAT_DIO)) {
-		ret = fdc_DataRegRead();
+		ret = fdc_dataread();
 	}
 	else {
 		ret = fdc.lastdata;
@@ -772,7 +776,7 @@ static REG8 IOINPCALL fdc_i94(UINT port)
 static void IOOUTCALL fdc_oca(UINT port, REG8 dat) {
 
 	CTRL_FDMEDIA = DISKTYPE_2DD;
-	fdc_DataRegWrite(dat);
+	fdc_datawrite(dat);
 	(void)port;
 }
 
@@ -796,7 +800,7 @@ static REG8 IOINPCALL fdc_ica(UINT port)
 	REG8	ret;
 
 	CTRL_FDMEDIA = DISKTYPE_2DD;
-	ret = fdc_DataRegRead();
+	ret = fdc_dataread();
 
 	(void)port;
 	return(ret);
@@ -843,6 +847,8 @@ void fdc_reset(void) {
 	ZeroMemory(&fdc, sizeof(fdc));
 	fdcstatusreset();
 	CTRL_FDMEDIA = DISKTYPE_2HD;
+	dmac_attach(DMADEV_FDD, FDC_DMACH2HD);
+	dmac_attach(DMADEV_FDD, FDC_DMACH2DD);
 }
 
 void fdc_bind(void) {