--- np2/cbus/sasiio.c	2005/02/09 20:11:33	1.8
+++ np2/cbus/sasiio.c	2005/03/05 06:02:28	1.10
@@ -43,7 +43,7 @@ enum {
 	_SASIIO		sasiio;
 
 
-static BOOL sasiseek(void) {
+static BRESULT sasiseek(void) {
 
 	SXSIDEV	sxsi;
 
@@ -59,7 +59,7 @@ static BOOL sasiseek(void) {
 	return(SUCCESS);
 }
 
-static BOOL sasiflash(void) {
+static BRESULT sasiflash(void) {
 
 	SXSIDEV	sxsi;
 
@@ -419,15 +419,15 @@ static REG8 IOINPCALL sasiio_i82(UINT po
 	else {
 		ret = 0;
 		sxsi = sxsi_getptr(0x00);		// SASI-1
-		if ((sxsi) && ((sxsi->type & SXSITYPE_IFMASK) == SXSITYPE_SASI)) {
-			ret |= (sxsi->type >> (8 - 3)) & 0x38;
+		if (sxsi) {
+			ret |= (sxsi->mediatype & 7) << 3;
 		}
 		else {
-			ret |= 0x38;
+			ret |= (7 << 3);
 		}
 		sxsi = sxsi_getptr(0x01);		// SASI-2
-		if ((sxsi) && ((sxsi->type & SXSITYPE_IFMASK) == SXSITYPE_SASI)) {
-			ret |= (sxsi->type >> 8) & 7;
+		if (sxsi) {
+			ret |= (sxsi->mediatype & 7);
 		}
 		else {
 			ret |= 7;