--- np2/fdd/fdd_xdf.c	2004/02/13 14:52:21	1.5
+++ np2/fdd/fdd_xdf.c	2005/03/22 04:03:15	1.11
@@ -13,6 +13,10 @@ static const _XDFINFO supportxdf[] = {
 			// 512
 			{0, 154, 15, 2, DISKTYPE_2HD, 0},
 #endif
+#if 1
+			// 512
+			{0, 160, 15, 2, DISKTYPE_2HD, 0},
+#endif
 			// 1024
 			{0, 154,  8, 3, DISKTYPE_2HD, 0},
 			// 1.44MB
@@ -20,18 +24,18 @@ static const _XDFINFO supportxdf[] = {
 };
 
 typedef struct {
-	BYTE	dummy[4];
-	BYTE	fddtype[4];
-	BYTE	headersize[4];
-	BYTE	fddsize[4];
-	BYTE	sectorsize[4];
-	BYTE	sectors[4];
-	BYTE	surfaces[4];
-	BYTE	cylinders[4];
+	UINT8	dummy[4];
+	UINT8	fddtype[4];
+	UINT8	headersize[4];
+	UINT8	fddsize[4];
+	UINT8	sectorsize[4];
+	UINT8	sectors[4];
+	UINT8	surfaces[4];
+	UINT8	cylinders[4];
 } FDIHDR;
 
 
-BOOL fddxdf_set(FDDFILE fdd, const char *fname, int ro) {
+BRESULT fddxdf_set(FDDFILE fdd, const OEMCHAR *fname, int ro) {
 
 const _XDFINFO	*xdf;
 	short		attr;
@@ -51,12 +55,11 @@ const _XDFINFO	*xdf;
 	file_close(fh);
 
 	xdf = supportxdf;
-	while(xdf < (supportxdf + (sizeof(supportxdf)/sizeof(_XDFINFO)))) {
+	while(xdf < (supportxdf + NELEMENTS(supportxdf))) {
 		size = xdf->tracks;
 		size *= xdf->sectors;
 		size <<= (7 + xdf->n);
 		if (size == fdsize) {
-			file_cpyname(fdd->fname, fname, sizeof(fdd->fname));
 			fdd->type = DISKTYPE_BETA;
 			fdd->protect = ((attr & 1) || (ro))?TRUE:FALSE;
 			fdd->inf.xdf = *xdf;
@@ -68,7 +71,7 @@ const _XDFINFO	*xdf;
 }
 
 // こっそり対応したりして
-BOOL fddxdf_setfdi(FDDFILE fdd, const char *fname, int ro) {
+BRESULT fddxdf_setfdi(FDDFILE fdd, const OEMCHAR *fname, int ro) {
 
 	short	attr;
 	FILEH	fh;
@@ -146,7 +149,6 @@ BOOL fddxdf_setfdi(FDDFILE fdd, const ch
 		default:
 			return(FAILURE);
 	}
-	file_cpyname(fdd->fname, fname, sizeof(fdd->fname));
 	fdd->type = DISKTYPE_BETA;
 	fdd->protect = ((attr & 1) || (ro))?TRUE:FALSE;
 	fdd->inf.xdf.headersize = headersize;
@@ -158,7 +160,7 @@ BOOL fddxdf_setfdi(FDDFILE fdd, const ch
 	return(SUCCESS);
 }
 
-BOOL fddxdf_eject(FDDFILE fdd) {
+BRESULT fddxdf_eject(FDDFILE fdd) {
 
 	fdd->fname[0] = '\0';
 	fdd->type = DISKTYPE_NOTREADY;
@@ -166,7 +168,7 @@ BOOL fddxdf_eject(FDDFILE fdd) {
 }
 
 
-BOOL fddxdf_diskaccess(FDDFILE fdd) {
+BRESULT fddxdf_diskaccess(FDDFILE fdd) {
 
 	if ((fdd->type != DISKTYPE_BETA) ||
 		(CTRL_FDMEDIA != fdd->inf.xdf.disktype)) {
@@ -175,7 +177,7 @@ BOOL fddxdf_diskaccess(FDDFILE fdd) {
 	return(SUCCESS);
 }
 
-BOOL fddxdf_seek(FDDFILE fdd) {
+BRESULT fddxdf_seek(FDDFILE fdd) {
 
 	if ((fdd->type != DISKTYPE_BETA) ||
 		(CTRL_FDMEDIA != fdd->inf.xdf.disktype) ||
@@ -186,7 +188,7 @@ BOOL fddxdf_seek(FDDFILE fdd) {
 	return(SUCCESS);
 }
 
-BOOL fddxdf_seeksector(FDDFILE fdd) {
+BRESULT fddxdf_seeksector(FDDFILE fdd) {
 
 	if ((fdd->type != DISKTYPE_BETA) ||
 		(CTRL_FDMEDIA != fdd->inf.xdf.disktype) ||
@@ -206,18 +208,18 @@ BOOL fddxdf_seeksector(FDDFILE fdd) {
 	return(SUCCESS);
 }
 
-BOOL fddxdf_read(FDDFILE fdd) {
+BRESULT fddxdf_read(FDDFILE fdd) {
 
 	FILEH	hdl;
 	long	seekp;
 	UINT	secsize;
 
-	fddlasterror = 0x00;										// ver0.28
+	fddlasterror = 0x00;
 	if (fddxdf_seeksector(fdd)) {
 		return(FAILURE);
 	}
 	if (fdc.N != fdd->inf.xdf.n) {
-		fddlasterror = 0xc0;									// ver0.28
+		fddlasterror = 0xc0;
 		return(FAILURE);
 	}
 
@@ -230,38 +232,38 @@ BOOL fddxdf_read(FDDFILE fdd) {
 
 	hdl = file_open_rb(fdd->fname);
 	if (hdl == FILEH_INVALID) {
-		fddlasterror = 0xe0;									// ver0.28
+		fddlasterror = 0xe0;
 		return(FAILURE);
 	}
 	if ((file_seek(hdl, seekp, FSEEK_SET) != seekp) ||
 		(file_read(hdl, fdc.buf, secsize) != secsize)) {
 		file_close(hdl);
-		fddlasterror = 0xe0;									// ver0.28
+		fddlasterror = 0xe0;
 		return(FAILURE);
 	}
 	file_close(hdl);
 	fdc.bufcnt = secsize;
-	fddlasterror = 0x00;										// ver0.28
+	fddlasterror = 0x00;
 	return(SUCCESS);
 }
 
-BOOL fddxdf_write(FDDFILE fdd) {
+BRESULT fddxdf_write(FDDFILE fdd) {
 
 	FILEH	hdl;
 	long	seekp;
 	UINT	secsize;
 
-	fddlasterror = 0x00;										// ver0.28
+	fddlasterror = 0x00;
 	if (fddxdf_seeksector(fdd)) {
-		fddlasterror = 0xe0;									// ver0.28
+		fddlasterror = 0xe0;
 		return(FAILURE);
 	}
 	if (fdd->protect) {
-		fddlasterror = 0x70;									// ver0.28
+		fddlasterror = 0x70;
 		return(FAILURE);
 	}
 	if (fdc.N != fdd->inf.xdf.n) {
-		fddlasterror = 0xc0;									// ver0.28
+		fddlasterror = 0xc0;
 		return(FAILURE);
 	}
 
@@ -274,22 +276,22 @@ BOOL fddxdf_write(FDDFILE fdd) {
 
 	hdl = file_open(fdd->fname);
 	if (hdl == FILEH_INVALID) {
-		fddlasterror = 0xc0;									// ver0.28
+		fddlasterror = 0xc0;
 		return(FAILURE);
 	}
 	if ((file_seek(hdl, seekp, FSEEK_SET) != seekp) ||
 		(file_write(hdl, fdc.buf, secsize) != secsize)) {
 		file_close(hdl);
-		fddlasterror = 0xc0;									// ver0.28
+		fddlasterror = 0xc0;
 		return(FAILURE);
 	}
 	file_close(hdl);
 	fdc.bufcnt = secsize;
-	fddlasterror = 0x00;										// ver0.28
+	fddlasterror = 0x00;
 	return(SUCCESS);
 }
 
-BOOL fddxdf_readid(FDDFILE fdd) {
+BRESULT fddxdf_readid(FDDFILE fdd) {
 
 	fddlasterror = 0x00;
 	if ((!fdc.mf) ||