--- np2/fdd/fdd_d88.c 2004/06/18 07:42:13 1.6 +++ np2/fdd/fdd_d88.c 2005/02/07 14:46:09 1.9 @@ -30,11 +30,11 @@ 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; @@ -71,7 +71,7 @@ dtfd_err1: return(FAILURE); } -static BOOL d88trk_read(D88TRK trk, FDDFILE fdd, UINT track, BYTE type) { +static BOOL 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")); @@ -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; @@ -435,7 +434,7 @@ BOOL fdd_write_d88(void) { BOOL 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; @@ -609,7 +608,7 @@ BOOL fdd_formatinit_d88(void) { } // todo アンフォーマットとか ディスク1周した時の切り捨てとか… -BOOL fdd_formating_d88(const BYTE *ID) { +BOOL fdd_formating_d88(const UINT8 *ID) { FDDFILE fdd = fddfile + fdc.us;