--- np2/io/fdc.c	2004/08/02 11:47:30	1.14
+++ np2/io/fdc.c	2007/11/03 00:00:20	1.18
@@ -84,9 +84,9 @@ void fdcsend_error7(void) {
 	fdc.event = FDCEVENT_BUFSEND;
 	fdc.bufp = 0;
 	fdc.bufcnt = 7;
-	fdc.buf[0] = (BYTE)(fdc.stat[fdc.us] >>  0);
-	fdc.buf[1] = (BYTE)(fdc.stat[fdc.us] >>  8);
-	fdc.buf[2] = (BYTE)(fdc.stat[fdc.us] >> 16);
+	fdc.buf[0] = (UINT8)(fdc.stat[fdc.us] >>  0);
+	fdc.buf[1] = (UINT8)(fdc.stat[fdc.us] >>  8);
+	fdc.buf[2] = (UINT8)(fdc.stat[fdc.us] >> 16);
 	fdc.buf[3] = fdc.C;
 	fdc.buf[4] = fdc.H;
 	fdc.buf[5] = fdc.R;
@@ -267,7 +267,7 @@ static void FDC_SenseDeviceStatus(void) 
 	}
 }
 
-static BOOL writesector(void) {
+static BRESULT writesector(void) {
 
 	fdc.stat[fdc.us] = (fdc.hd << 2) | fdc.us;
 	if (!FDC_DriveCheck(TRUE)) {
@@ -430,7 +430,7 @@ static void FDC_SenceintStatus(void) {		
 	if (fdc_isfdcinterrupt()) {
 		i = 0;
 		if (fdc.stat[fdc.us]) {
-			fdc.buf[0] = (BYTE)fdc.stat[fdc.us];
+			fdc.buf[0] = (UINT8)fdc.stat[fdc.us];
 			fdc.buf[1] = fdc.treg[fdc.us];
 			fdc.bufcnt = 2;
 			fdc.stat[fdc.us] = 0;
@@ -439,7 +439,7 @@ static void FDC_SenceintStatus(void) {		
 		else {
 			for (; i<4; i++) {
 				if (fdc.stat[i]) {
-					fdc.buf[0] = (BYTE)fdc.stat[i];
+					fdc.buf[0] = (UINT8)fdc.stat[i];
 					fdc.buf[1] = fdc.treg[i];
 					fdc.bufcnt = 2;
 					fdc.stat[i] = 0;
@@ -712,7 +712,7 @@ REG8 DMACCALL fdc_dataread(void) {
 
 static void IOOUTCALL fdc_o92(UINT port, REG8 dat) {
 
-	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
+//	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
 
 	if (((port >> 4) ^ fdc.chgreg) & 1) {
 		return;
@@ -724,7 +724,7 @@ static void IOOUTCALL fdc_o92(UINT port,
 
 static void IOOUTCALL fdc_o94(UINT port, REG8 dat) {
 
-	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
+//	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
 
 	if (((port >> 4) ^ fdc.chgreg) & 1) {
 		return;
@@ -762,7 +762,7 @@ static REG8 IOINPCALL fdc_i92(UINT port)
 	else {
 		ret = fdc.lastdata;
 	}
-	TRACEOUT(("fdc in %.2x %.2x [%.4x:%.4x]", port, ret, CPU_CS, CPU_IP));
+//	TRACEOUT(("fdc in %.2x %.2x [%.4x:%.4x]", port, ret, CPU_CS, CPU_IP));
 	return(ret);
 }
 
@@ -823,14 +823,14 @@ static const IOINP fdci90[4] = {
 static const IOOUT fdcobe[1] = {fdc_obe};
 static const IOINP fdcibe[1] = {fdc_ibe};
 
-void fdc_reset(void) {
+void fdc_reset(const NP2CFG *pConfig) {
 
 	ZeroMemory(&fdc, sizeof(fdc));
-	fdc.equip = np2cfg.fddequip;
+	fdc.equip = pConfig->fddequip;
 #if defined(SUPPORT_PC9821)
 	fdc.support144 = 1;
 #else
-	fdc.support144 = np2cfg.usefd144;
+	fdc.support144 = pConfig->usefd144;
 #endif
 	fdcstatusreset();
 	dmac_attach(DMADEV_2HD, FDC_DMACH2HD);