--- np2/fdd/fdd_xdf.c	2004/02/13 14:52:21	1.5
+++ np2/fdd/fdd_xdf.c	2005/02/09 20:11:34	1.9
@@ -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) {
+BOOL fddxdf_set(FDDFILE fdd, const OEMCHAR *fname, int ro) {
 
 const _XDFINFO	*xdf;
 	short		attr;
@@ -51,7 +55,7 @@ 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);
@@ -68,7 +72,7 @@ const _XDFINFO	*xdf;
 }
 
 // こっそり対応したりして
-BOOL fddxdf_setfdi(FDDFILE fdd, const char *fname, int ro) {
+BOOL fddxdf_setfdi(FDDFILE fdd, const OEMCHAR *fname, int ro) {
 
 	short	attr;
 	FILEH	fh;
@@ -146,7 +150,7 @@ BOOL fddxdf_setfdi(FDDFILE fdd, const ch
 		default:
 			return(FAILURE);
 	}
-	file_cpyname(fdd->fname, fname, sizeof(fdd->fname));
+	file_cpyname(fdd->fname, fname, NELEMENTS(fdd->fname));
 	fdd->type = DISKTYPE_BETA;
 	fdd->protect = ((attr & 1) || (ro))?TRUE:FALSE;
 	fdd->inf.xdf.headersize = headersize;
@@ -212,12 +216,12 @@ BOOL fddxdf_read(FDDFILE fdd) {
 	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,18 +234,18 @@ 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);
 }
 
@@ -251,17 +255,17 @@ BOOL fddxdf_write(FDDFILE fdd) {
 	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,18 +278,18 @@ 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);
 }