--- np2/statsave.c	2005/02/09 20:11:33	1.44
+++ np2/statsave.c	2005/03/05 06:02:28	1.46
@@ -104,7 +104,7 @@ typedef struct {
 // ----
 
 // 関数ポインタを intに変更。
-static BOOL proc2num(void *func, const PROCTBL *tbl, int size) {
+static BRESULT proc2num(void *func, const PROCTBL *tbl, int size) {
 
 	int		i;
 
@@ -118,7 +118,7 @@ static BOOL proc2num(void *func, const P
 	return(FAILURE);
 }
 
-static BOOL num2proc(void *func, const PROCTBL *tbl, int size) {
+static BRESULT num2proc(void *func, const PROCTBL *tbl, int size) {
 
 	int		i;
 
@@ -963,16 +963,16 @@ static int flagsave_disk(STFLAGH sfh, co
 	int		ret;
 	UINT8	i;
 
-	sxsi_flash();
+	sxsi_allflash();
 	ret = STATFLAG_SUCCESS;
 	for (i=0; i<4; i++) {
 		ret |= disksave(sfh, fdd_diskname(i), fdd_diskprotect(i));
 	}
 	for (i=0x00; i<0x02; i++) {
-		ret |= disksave(sfh, sxsi_getname(i), 0);
+		ret |= disksave(sfh, sxsi_getfilename(i), 0);
 	}
 	for (i=0x20; i<0x24; i++) {
-		ret |= disksave(sfh, sxsi_getname(i), 0);
+		ret |= disksave(sfh, sxsi_getfilename(i), 0);
 	}
 	(void)tbl;
 	return(ret);
@@ -1020,7 +1020,7 @@ static int flagcheck_disk(STFLAGH sfh, c
 		OEMSPRINTF(buf, str_fddx, i+1);
 		ret |= diskcheck(sfh, buf);
 	}
-	sxsi_flash();
+	sxsi_allflash();
 	for (i=0; i<2; i++) {
 		OEMSPRINTF(buf, str_sasix, i+1);
 		ret |= diskcheck(sfh, buf);
@@ -1049,13 +1049,13 @@ static int flagload_disk(STFLAGH sfh, co
 	for (i=0x00; i<0x02; i++) {
 		ret |= statflag_read(sfh, &st, sizeof(st));
 		if (st.path[0]) {
-			sxsi_hddopen(i, st.path);
+			sxsi_devopen(i, st.path);
 		}
 	}
 	for (i=0x20; i<0x24; i++) {
 		ret |= statflag_read(sfh, &st, sizeof(st));
 		if (st.path[0]) {
-			sxsi_hddopen(i, st.path);
+			sxsi_devopen(i, st.path);
 		}
 	}
 	(void)tbl;
@@ -1353,7 +1353,7 @@ const SFENTRY	*tblterm;
 	rs232c_midipanic();
 	mpu98ii_midipanic();
 	pc9861k_midipanic();
-	sxsi_trash();
+	sxsi_alltrash();
 
 	ret |= flagload_common(&sffh->sfh, np2tbl);