--- np2/fdd/fdd_d88.c	2004/06/18 07:42:13	1.6
+++ np2/fdd/fdd_d88.c	2005/02/12 12:40:39	1.11
@@ -30,17 +30,17 @@ static UINT32 nexttrackptr(FDDFILE fdd, 
 typedef struct {
 	FDDFILE	fdd;
 	UINT	track;
-	BYTE	type;
+	UINT	type;
 	long	fptr;
 	UINT	size;
 	BOOL	write;
-	BYTE	buf[D88BUFSIZE];
+	UINT8	buf[D88BUFSIZE];
 } _D88TRK, *D88TRK;
 
 static	_D88TRK		d88trk;
 
 
-static BOOL d88trk_flushdata(D88TRK trk) {
+static BRESULT d88trk_flushdata(D88TRK trk) {
 
 	FDDFILE		fdd;
 	FILEH		fh;
@@ -71,7 +71,7 @@ dtfd_err1:
 	return(FAILURE);
 }
 
-static BOOL d88trk_read(D88TRK trk, FDDFILE fdd, UINT track, BYTE type) {
+static BRESULT d88trk_read(D88TRK trk, FDDFILE fdd, UINT track, UINT type) {
 
 	UINT8	rpm;
 	FILEH	fh;
@@ -84,7 +84,6 @@ static BOOL d88trk_read(D88TRK trk, FDDF
 	}
 
 	rpm = fdc.rpm[fdc.us];
-	TRACEOUT(("d88trk_read(%d,%d)", rpm, track));
 	switch(fdd->inf.d88.fdtype_major) {
 		case DISKTYPE_2D:
 			TRACEOUT(("DISKTYPE_2D"));
@@ -147,7 +146,7 @@ dtrd_err1:
 }
 
 
-static BOOL rpmcheck(D88SEC sec) {
+static BRESULT rpmcheck(D88SEC sec) {
 
 	FDDFILE	fdd = fddfile + fdc.us;
 	UINT8	rpm;
@@ -194,7 +193,7 @@ static void drvflush(FDDFILE fdd) {
 	}
 }
 
-static BOOL trkseek(FDDFILE fdd, UINT track) {
+static BRESULT trkseek(FDDFILE fdd, UINT track) {
 
 	D88TRK	trk;
 	BOOL	r;
@@ -213,7 +212,7 @@ static BOOL trkseek(FDDFILE fdd, UINT tr
 
 static D88SEC searchsector_d88(BOOL check) {			// ver0.29
 
-	BYTE	*p;
+	UINT8	*p;
 	UINT	sec;
 	UINT	pos = 0;
 	UINT	nsize;
@@ -264,7 +263,7 @@ static D88SEC searchsector_d88(BOOL chec
 
 // ----
 
-BOOL fddd88_set(FDDFILE fdd, const char *fname, int ro) {
+BRESULT fddd88_set(FDDFILE fdd, const OEMCHAR *fname, int ro) {
 
 	short	attr;
 	FILEH	fh;
@@ -301,7 +300,7 @@ fdst_err:
 	return(FAILURE);
 }
 
-BOOL fddd88_eject(FDDFILE fdd) {
+BRESULT fddd88_eject(FDDFILE fdd) {
 
 	drvflush(fdd);
 	fdd->fname[0] = '\0';
@@ -311,7 +310,7 @@ BOOL fddd88_eject(FDDFILE fdd) {
 }
 
 
-BOOL fdd_diskaccess_d88(void) {										// ver0.31
+BRESULT fdd_diskaccess_d88(void) {									// ver0.31
 
 	FDDFILE	fdd = fddfile + fdc.us;
 	UINT8	rpm;
@@ -341,14 +340,14 @@ BOOL fdd_diskaccess_d88(void) {									
 	return(SUCCESS);
 }
 
-BOOL fdd_seek_d88(void) {
+BRESULT fdd_seek_d88(void) {
 
 	FDDFILE	fdd = fddfile + fdc.us;
 
 	return(trkseek(fdd, (fdc.ncn << 1) + fdc.hd));
 }
 
-BOOL fdd_seeksector_d88(void) {
+BRESULT fdd_seeksector_d88(void) {
 
 	FDDFILE	fdd = fddfile + fdc.us;
 
@@ -361,7 +360,7 @@ BOOL fdd_seeksector_d88(void) {
 	return(SUCCESS);
 }
 
-BOOL fdd_read_d88(void) {
+BRESULT fdd_read_d88(void) {
 
 	FDDFILE		fdd = fddfile + fdc.us;
 	D88SEC		p;
@@ -397,7 +396,7 @@ BOOL fdd_read_d88(void) {
 	return(SUCCESS);
 }
 
-BOOL fdd_write_d88(void) {
+BRESULT fdd_write_d88(void) {
 
 	FDDFILE		fdd = fddfile + fdc.us;
 	D88SEC		p;
@@ -432,10 +431,10 @@ BOOL fdd_write_d88(void) {
 	return(SUCCESS);
 }
 
-BOOL fdd_readid_d88(void) {
+BRESULT fdd_readid_d88(void) {
 
 	FDDFILE	fdd = fddfile + fdc.us;
-	BYTE	*p;
+	UINT8	*p;
 	UINT	sec;
 	UINT	pos = 0;
 	UINT	sectors;
@@ -485,8 +484,8 @@ BOOL fdd_readid_d88(void) {
 
 // えーと…こんなところにあって大丈夫？
 static BOOL formating = FALSE;
-static BYTE formatsec = 0;
-static BYTE formatwrt = 0;
+static UINT8 formatsec = 0;
+static UINT8 formatwrt = 0;
 static UINT formatpos = 0;
 
 static int fileappend(FILEH hdl, FDDFILE fdd,
@@ -496,7 +495,7 @@ static int fileappend(FILEH hdl, FDDFILE
 	UINT	size;
 	UINT	rsize;
 	int		t;
-	BYTE	tmp[0x1000];
+	UINT8	tmp[0x400];							// Stack 0x1000->0x400
 	UINT32	cur;
 
 	if ((length = last - ptr) <= 0) {			// 書き換える必要なし
@@ -528,7 +527,7 @@ static int fileappend(FILEH hdl, FDDFILE
 }
 
 
-static void endoftrack(UINT fmtsize, BYTE sectors) {
+static void endoftrack(UINT fmtsize, UINT8 sectors) {
 
 	FDDFILE	fdd = fddfile + fdc.us;
 
@@ -595,7 +594,7 @@ static void endoftrack(UINT fmtsize, BYT
 }
 
 
-BOOL fdd_formatinit_d88(void) {
+BRESULT fdd_formatinit_d88(void) {
 
 	if (fdc.treg[fdc.us] < 82) {
 		formating = TRUE;
@@ -609,7 +608,7 @@ BOOL fdd_formatinit_d88(void) {
 }
 
 	// todo アンフォーマットとか ディスク１周した時の切り捨てとか…
-BOOL fdd_formating_d88(const BYTE *ID) {
+BRESULT fdd_formating_d88(const UINT8 *ID) {
 
 	FDDFILE	fdd = fddfile + fdc.us;