--- np2/fdd/fddfile.h	2003/10/16 17:58:28	1.1
+++ np2/fdd/fddfile.h	2005/02/12 12:40:39	1.7
@@ -33,11 +33,12 @@ enum {
 };
 
 typedef struct {
-	BYTE	tracks;
-	BYTE	sectors;
-	BYTE	n;
-	BYTE	meida;
-	BYTE	rpm;
+	UINT32	headersize;
+	UINT8	tracks;
+	UINT8	sectors;
+	UINT8	n;
+	UINT8	disktype;
+	UINT8	rpm;
 } _XDFINFO, *XDFINFO;
 
 typedef struct {
@@ -49,10 +50,10 @@ typedef struct {
 } _D88INFO, *D88INFO;
 
 typedef struct {
-	char	fname[MAX_PATH];
-	BYTE	type;
-	BYTE	num;
-	BYTE	protect;
+	OEMCHAR	fname[MAX_PATH];
+	UINT8	type;
+	UINT8	num;
+	UINT8	protect;
 	union {
 		_XDFINFO	xdf;
 		_D88INFO	d88;
@@ -65,31 +66,31 @@ extern "C" {
 #endif
 
 extern	_FDDFILE	fddfile[MAX_FDDFILE];
-extern	BYTE		fddlasterror;
+extern	UINT8		fddlasterror;
 
 // 起動時に一回だけ初期化
-void fddfile_init(void);
+void fddfile_initialize(void);
 
 void fddfile_reset2dmode(void);
 
-const char *fdd_diskname(BYTE drv);
-BOOL fdd_diskready(BYTE drv);
-BOOL fdd_diskprotect(BYTE drv);
-
-BOOL fdd_set(BYTE drv, const char *fname, UINT ftype, int ro);
-BOOL fdd_eject(BYTE drv);
-
-BOOL fdd_diskaccess(void);
-BOOL fdd_seek(void);
-BOOL fdd_seeksector(void);
-BOOL fdd_read(void);
-BOOL fdd_write(void);
-BOOL fdd_diagread(void);
-BOOL fdd_readid(void);
-BOOL fdd_writeid(void);
+const OEMCHAR *fdd_diskname(REG8 drv);
+BOOL fdd_diskready(REG8 drv);
+BOOL fdd_diskprotect(REG8 drv);
+
+BRESULT fdd_set(REG8 drv, const OEMCHAR *fname, UINT ftype, int ro);
+BRESULT fdd_eject(REG8 drv);
+
+BRESULT fdd_diskaccess(void);
+BRESULT fdd_seek(void);
+BRESULT fdd_seeksector(void);
+BRESULT fdd_read(void);
+BRESULT fdd_write(void);
+BRESULT fdd_diagread(void);
+BRESULT fdd_readid(void);
+BRESULT fdd_writeid(void);
 
-BOOL fdd_formatinit(void);
-BOOL fdd_formating(const BYTE *ID);
+BRESULT fdd_formatinit(void);
+BRESULT fdd_formating(const UINT8 *ID);
 BOOL fdd_isformating(void);
 
 #ifdef __cplusplus