--- np2/fdd/sxsi.c	2004/01/27 07:24:25	1.10
+++ np2/fdd/sxsi.c	2005/02/12 12:40:39	1.15
@@ -37,7 +37,7 @@ const SASIHDD	*sasi;
 	UINT		i;
 
 	sasi = sasihdd;
-	for (i=0; i<sizeof(sasihdd)/sizeof(SASIHDD); i++, sasi++) {
+	for (i=0; i<NELEMENTS(sasihdd); i++, sasi++) {
 		if ((sxsi->size == 256) &&
 			(sxsi->sectors == sasi->sectors) &&
 			(sxsi->surfaces == sasi->surfaces) &&
@@ -56,7 +56,7 @@ void sxsi_initialize(void) {
 	UINT	i;
 
 	ZeroMemory(sxsi_dev, sizeof(sxsi_dev));
-	for (i=0; i<(sizeof(sxsi_dev)/sizeof(_SXSIDEV)); i++) {
+	for (i=0; i<NELEMENTS(sxsi_dev); i++) {
 		sxsi_dev[i].fh = (long)FILEH_INVALID;
 	}
 }
@@ -66,20 +66,22 @@ SXSIDEV sxsi_getptr(REG8 drv) {
 	UINT	num;
 
 	num = drv & 0x0f;
-	if (!(drv & 0x20)) {			// SASI or IDE
-		if (num < 2) {
+	if (!(drv & 0x20)) {					// SASI or IDE
+		if (num < SASIHDD_MAX) {
 			return(sxsi_dev + num);
 		}
 	}
+#if defined(SUPPORT_SCSI)
 	else {
-		if (num < 4) {				// SCSI
+		if (num < SCSIHDD_MAX) {			// SCSI
 			return(sxsi_dev + SASIHDD_MAX + num);
 		}
 	}
+#endif
 	return(NULL);
 }
 
-const char *sxsi_getname(REG8 drv) {
+const OEMCHAR *sxsi_getname(REG8 drv) {
 
 	SXSIDEV	sxsi;
 
@@ -90,18 +92,18 @@ const char *sxsi_getname(REG8 drv) {
 	return(NULL);
 }
 
-BOOL sxsi_hddopen(REG8 drv, const char *file) {
+BRESULT sxsi_hddopen(REG8 drv, const OEMCHAR *file) {
 
-	SXSIDEV	sxsi;
-	FILEH	fh;
-const char	*ext;
-	UINT16	type;
-	long	totals;
-	UINT32	headersize;
-	UINT32	surfaces;
-	UINT32	cylinders;
-	UINT32	sectors;
-	UINT32	size;
+	SXSIDEV		sxsi;
+	FILEH		fh;
+const OEMCHAR	*ext;
+	UINT16		type;
+	long		totals;
+	UINT32		headersize;
+	UINT32		surfaces;
+	UINT32		cylinders;
+	UINT32		sectors;
+	UINT32		size;
 
 	if ((file == NULL) || (file[0] == '\0')) {
 		goto sxsiope_err1;
@@ -114,7 +116,7 @@ const char	*ext;
 	if (fh == FILEH_INVALID) {
 		goto sxsiope_err1;
 	}
-	ext = file_getext((char *)file);
+	ext = file_getext(file);
 	type = SXSITYPE_HDD;
 	if ((!file_cmpname(ext, str_thd)) && (!(drv & 0x20))) {
 		THDHDR thd;						// T98 HDD (IDE)
@@ -194,7 +196,7 @@ const char	*ext;
 	sxsi->type = type;
 	sxsi->headersize = headersize;
 	sxsi->fh = (long)fh;
-	file_cpyname(sxsi->fname, file, sizeof(sxsi->fname));
+	file_cpyname(sxsi->fname, file, NELEMENTS(sxsi->fname));
 	if (type == (SXSITYPE_IDE | SXSITYPE_HDD)) {
 		sasihddcheck(sxsi);
 	}
@@ -219,12 +221,14 @@ void sxsi_open(void) {
 			drv++;
 		}
 	}
+#if defined(SUPPORT_SCSI)
 	drv = 0x20;
 	for (i=0; i<4; i++) {
 		if (sxsi_hddopen(drv, np2cfg.scsihdd[i]) == SUCCESS) {
 			drv++;
 		}
 	}
+#endif
 }
 
 void sxsi_flash(void) {
@@ -233,7 +237,7 @@ void sxsi_flash(void) {
 	SXSIDEV	sxsiterm;
 
 	sxsi = sxsi_dev;
-	sxsiterm = sxsi + (sizeof(sxsi_dev)/sizeof(_SXSIDEV));
+	sxsiterm = sxsi + NELEMENTS(sxsi_dev);
 	while(sxsi < sxsiterm) {
 		if ((FILEH)sxsi->fh != FILEH_INVALID) {
 			file_close((FILEH)sxsi->fh);
@@ -249,7 +253,7 @@ void sxsi_trash(void) {
 	SXSIDEV	sxsiterm;
 
 	sxsi = sxsi_dev;
-	sxsiterm = sxsi + (sizeof(sxsi_dev)/sizeof(_SXSIDEV));
+	sxsiterm = sxsi + NELEMENTS(sxsi_dev);
 	while(sxsi < sxsiterm) {
 		if ((FILEH)sxsi->fh != FILEH_INVALID) {
 			file_close((FILEH)sxsi->fh);
@@ -262,16 +266,10 @@ void sxsi_trash(void) {
 
 static SXSIDEV getdrive(REG8 drv) {
 
-	UINT	num;
 	SXSIDEV	ret;
 
-	num = drv & 0x0f;
-	if (num >= 2) {
-		return(NULL);
-	}
-	num += (drv & 0x20) >> 4;
-	ret = sxsi_dev + num;
-	if (ret->fname[0] == '\0') {
+	ret = sxsi_getptr(drv);
+	if ((ret == NULL) || (ret->fname[0] == '\0')) {
 		return(NULL);
 	}
 	if ((FILEH)ret->fh == FILEH_INVALID) {
@@ -337,7 +335,7 @@ BOOL sxsi_iside(void) {
 	return(FALSE);
 }
 
-REG8 sxsi_read(REG8 drv, long pos, BYTE *buf, UINT size) {
+REG8 sxsi_read(REG8 drv, long pos, UINT8 *buf, UINT size) {
 
 const _SXSIDEV	*sxsi;
 	long		r;
@@ -347,11 +345,11 @@ const _SXSIDEV	*sxsi;
 	if (sxsi == NULL) {
 		return(0x60);
 	}
-	pos = pos * sxsi->size + sxsi->headersize;
-	r = file_seek((FILEH)sxsi->fh, pos, FSEEK_SET);
-	if (r == -1) {
+	if ((pos < 0) || (pos >= sxsi->totals)) {
 		return(0x40);
 	}
+	pos = pos * sxsi->size + sxsi->headersize;
+	r = file_seek((FILEH)sxsi->fh, pos, FSEEK_SET);
 	if (pos != r) {
 		return(0xd0);
 	}
@@ -367,7 +365,7 @@ const _SXSIDEV	*sxsi;
 	return(0x00);
 }
 
-REG8 sxsi_write(REG8 drv, long pos, const BYTE *buf, UINT size) {
+REG8 sxsi_write(REG8 drv, long pos, const UINT8 *buf, UINT size) {
 
 const _SXSIDEV	*sxsi;
 	long		r;
@@ -377,11 +375,11 @@ const _SXSIDEV	*sxsi;
 	if (sxsi == NULL) {
 		return(0x60);
 	}
-	pos = pos * sxsi->size + sxsi->headersize;
-	r = file_seek((FILEH)sxsi->fh, pos, FSEEK_SET);
-	if (r == -1) {
+	if ((pos < 0) || (pos >= sxsi->totals)) {
 		return(0x40);
 	}
+	pos = pos * sxsi->size + sxsi->headersize;
+	r = file_seek((FILEH)sxsi->fh, pos, FSEEK_SET);
 	if (pos != r) {
 		return(0xd0);
 	}
@@ -402,7 +400,7 @@ REG8 sxsi_format(REG8 drv, long pos) {
 const _SXSIDEV	*sxsi;
 	long		r;
 	UINT16		i;
-	BYTE		work[256];
+	UINT8		work[256];
 	UINT		size;
 	UINT		wsize;
 
@@ -410,11 +408,11 @@ const _SXSIDEV	*sxsi;
 	if (sxsi == NULL) {
 		return(0x60);
 	}
-	pos = pos * sxsi->size + sxsi->headersize;
-	r = file_seek((FILEH)sxsi->fh, pos, FSEEK_SET);
-	if (r == -1) {
+	if ((pos < 0) || (pos >= sxsi->totals)) {
 		return(0x40);
 	}
+	pos = pos * sxsi->size + sxsi->headersize;
+	r = file_seek((FILEH)sxsi->fh, pos, FSEEK_SET);
 	if (pos != r) {
 		return(0xd0);
 	}