--- xmil/fdd/fdd_2d.c	2004/08/13 01:35:59	1.7
+++ xmil/fdd/fdd_2d.c	2008/06/02 20:07:31	1.10
@@ -1,18 +1,21 @@
 #include	"compiler.h"
 #include	"dosio.h"
 #include	"pccore.h"
-#include	"iocore.h"
 #include	"fddfile.h"
 #include	"fdd_2d.h"
 #include	"fdd_mtr.h"
 
 
+static const _XDFINFO supportxdf[] = {
+			{0,  80, 16, 1, DISKTYPE_2D},
+			{0, 154, 26, 1, DISKTYPE_2HD}};
+
+
 static REG8 fdd2d_seek(FDDFILE fdd, REG8 media, UINT track) {
 
-	if ((media != 0) || (track >= 80)) {
+	if ((media != fdd->inf.xdf.media) || (track >= fdd->inf.xdf.tracks)) {
 		return(FDDSTAT_SEEKERR);
 	}
-	(void)fdd;
 	return(0x00);
 }
 
@@ -20,28 +23,32 @@ static REG8 fdd2d_read(FDDFILE fdd, REG8
 												UINT8 *ptr, UINT *size) {
 
 	UINT	secsize;
+	UINT	rsize;
 	FILEH	fh;
 	long	pos;
 	BRESULT	b;
 
-	if ((media != 0) || (track >= 80) || (sc == 0) || (sc > 16)) {
+	if ((media != fdd->inf.xdf.media) || (track >= fdd->inf.xdf.tracks) ||
+		(sc == 0) || (sc > fdd->inf.xdf.sectors)) {
 		goto fd2r_err;
 	}
-	secsize = min(*size, 256);
+	secsize = 1 << (7 + fdd->inf.xdf.n);
+	rsize = min(secsize, *size);
 	if (ptr) {
 		fh = file_open_rb(fdd->fname);
 		if (fh == FILEH_INVALID) {
 			goto fd2r_err;
 		}
-		pos = ((track * 16) + (sc - 1)) * 256;
+		pos = ((track * fdd->inf.xdf.sectors) + (sc - 1)) * secsize;
+		pos += fdd->inf.xdf.headersize;
 		b = (file_seek(fh, pos, FSEEK_SET) != pos) ||
-			(file_read(fh, ptr, secsize) != secsize);
+			(file_read(fh, ptr, rsize) != rsize);
 		file_close(fh);
 		if (b) {
 			goto fd2r_err;
 		}
 	}
-	*size = secsize;
+	*size = rsize;
 	return(0x00);
 
 fd2r_err:
@@ -51,19 +58,22 @@ fd2r_err:
 static REG8 fdd2d_write(FDDFILE fdd, REG8 media, UINT track, REG8 sc,
 												const UINT8 *ptr, UINT size) {
 
+	UINT	secsize;
 	FILEH	fh;
 	long	pos;
 	BRESULT	b;
 
-	if ((media != 0) || (track >= 80) || (sc == 0) || (sc > 16)) {
+	if ((media != fdd->inf.xdf.media) || (track >= fdd->inf.xdf.tracks) ||
+		(sc == 0) || (sc > fdd->inf.xdf.sectors)) {
 		return(FDDSTAT_RECNFND | FDDSTAT_WRITEFAULT);
 	}
 	fh = file_open(fdd->fname);
 	if (fh == FILEH_INVALID) {
 		goto fd2w_err;
 	}
-	pos = ((track * 16) + (sc - 1)) * 256;
-	size = min(size, 256);
+	secsize = 1 << (7 + fdd->inf.xdf.n);
+	pos = ((track * fdd->inf.xdf.sectors) + (sc - 1)) * secsize;
+	size = min(size, secsize);
 	b = (file_seek(fh, pos, FSEEK_SET) != pos) ||
 		(file_write(fh, ptr, size) != size);
 	file_close(fh);
@@ -79,17 +89,16 @@ fd2w_err:
 static REG8 fdd2d_crc(FDDFILE fdd, REG8 media, UINT track, UINT num,
 												UINT8 *ptr) {
 
-	if ((media != 0) || (track >= 80) || (num >= 16)) {
+	if ((media != fdd->inf.xdf.media) || (track >= fdd->inf.xdf.tracks) ||
+		(num >= fdd->inf.xdf.sectors)) {
 		return(FDDSTAT_RECNFND);
 	}
 	ptr[0] = (UINT8)(track >> 1);
 	ptr[1] = (UINT8)(track & 1);
 	ptr[2] = (UINT8)(num + 1);
-	ptr[3] = 1;
-	ptr[4] = 0;										// CRC(Lo)
-	ptr[5] = 0;										// CRC(Hi)
-//	fdc.s.rreg = fdc.s.c;							// メルヘンヴェール
-	(void)fdd;
+	ptr[3] = fdd->inf.xdf.n;
+	ptr[4] = 0;										/* CRC(Lo) */
+	ptr[5] = 0;										/* CRC(Hi) */
 	return(0x00);
 }
 
@@ -99,40 +108,65 @@ static UINT32 fdd2d_sec(FDDFILE fdd, REG
 
 	UINT32	ret;
 
-	if ((media != 0) || (track >= 80)) {
+	if ((media != fdd->inf.xdf.media) || (track >= fdd->inf.xdf.tracks)) {
 		return(0);
 	}
-	if ((sc == 0) || (sc > 16)) {
-		ret = 16;
+	if ((sc == 0) || (sc > fdd->inf.xdf.sectors)) {
+		ret = fdd->inf.xdf.sectors;
 	}
 	else {
 		ret = sc;
 	}
-	return((16 << 16) + ret);
+	return((16 << fdd->inf.xdf.sectors) + ret);
 }
 #endif
 
 
-// ----
+/* ---- */
 
 BRESULT fdd2d_set(FDDFILE fdd, const OEMCHAR *fname) {
 
-	short	attr;
+	short		attr;
+	FILEH		fh;
+	UINT		fdsize;
+const _XDFINFO	*xdf;
+const _XDFINFO	*xdfterm;
+	UINT		size;
 
 	attr = file_attr(fname);
 	if (attr & 0x18) {
 		return(FAILURE);
 	}
-	fdd->type = DISKTYPE_BETA;
-	fdd->protect = (UINT8)(attr & 1);
-	fdd->seek = fdd2d_seek;
-	fdd->read = fdd2d_read;
-	fdd->write = fdd2d_write;
-	fdd->crc = fdd2d_crc;
+	fh = file_open(fname);
+	if (fh == FILEH_INVALID) {
+		return(FAILURE);
+	}
+	fdsize = file_getsize(fh);
+	file_close(fh);
+
+	xdf = supportxdf;
+	xdfterm = supportxdf + NELEMENTS(supportxdf);
+	while(xdf < xdfterm) {
+		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 = (UINT8)(attr & 1);
+			fdd->seek = fdd2d_seek;
+			fdd->read = fdd2d_read;
+			fdd->write = fdd2d_write;
+			fdd->crc = fdd2d_crc;
 #if defined(SUPPORT_DISKEXT)
-	fdd->sec = fdd2d_sec;
+			fdd->sec = fdd2d_sec;
 #endif
-	return(SUCCESS);
+			fdd->inf.xdf = *xdf;
+			return(SUCCESS);
+		}
+		xdf++;
+	}
+	return(FAILURE);
 }
 
 void fdd2d_eject(FDDFILE fdd) {