SYSCHK driver syncing

3 years ago · 590dcd0b4f
11 changed files with 18 additions and 46 deletions
--- a/Source/HBIOS/bqrtc.asm
+++ b/Source/HBIOS/bqrtc.asm
@ -161,9 +161,7 @@ BQRTC_DISPATCH:
 	JP	Z, BQRTC_SETALM			; Set Alarm
 	DEC	A
 	JP	Z, BQRTC_DEVICE			; Report RTC device info
-	CALL	SYSCHK
-	LD	A,ERR_NOFUNC
-	OR	A
+	SYSCHKERR(ERR_NOFUNC)
 	RET
 	
 ;
@ -173,9 +171,7 @@ BQRTC_GETBYT:
 BQRTC_SETBYT:
 BQRTC_GETBLK:
 BQRTC_SETBLK:
-	CALL	SYSCHK
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)
 	RET
 	
 ; RTC Get Time
--- a/Source/HBIOS/cvdu.asm
+++ b/Source/HBIOS/cvdu.asm
@ -171,9 +171,7 @@ CVDU_VDADEV:
 	RET

 CVDU_VDASCS:
-	CALL	SYSCHK		; NOT IMPLEMENTED (YET)
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)	; NOT IMPLEMENTED (YET)
 	RET

 CVDU_VDASCP:
--- a/Source/HBIOS/fd.asm
+++ b/Source/HBIOS/fd.asm
@ -490,9 +490,7 @@ FD_FNTBL:
 FD_VERIFY:
 FD_FORMAT:
 FD_DEFMED:
-	CALL	SYSCHK			; INVALID SUB-FUNCTION
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)		; INVALID SUB-FUNCTION
 	RET
 ;
 ;
@ -1149,9 +1147,7 @@ FD_RUN1:
 	JR	Z,FC_WRITE
 	CP	DOP_READID
 	JR	Z,FC_READID
-	CALL	SYSCHK
-	LD	A,ERR_NOFUNC
-	OR	A
+	SYSCHKERR(ERR_NOFUNC)
 	RET

 FD_RUNCHK:
--- a/Source/HBIOS/gdc.asm
+++ b/Source/HBIOS/gdc.asm
@ -157,9 +157,7 @@ GDC_VDADEV:	; VIDEO DEVICE INFORMATION
 	RET
 ;
 GDC_VDASCS:	; SET CURSOR STYLE
-	CALL	SYSCHK		; NOT IMPLEMENTED (YET)
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)
 	RET

 GDC_VDASCP:	; SET CURSOR POSITION
--- a/Source/HBIOS/ide.asm
+++ b/Source/HBIOS/ide.asm
@ -461,9 +461,7 @@ IDE_FNTBL:
 IDE_VERIFY:
 IDE_FORMAT:
 IDE_DEFMED:
-	CALL	SYSCHK			; NOT IMPLEMENTED
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)			; NOT IMPLEMENTED
 	RET
 ;
 ;
--- a/Source/HBIOS/ppp.asm
+++ b/Source/HBIOS/ppp.asm
@ -338,9 +338,7 @@ PPPCON_OST:
 ;
 ;
 PPPCON_INITDEV:
-	CALL	SYSCHK
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)
 	RET
 ;
 ;
@ -504,9 +502,7 @@ PPPSD_FNTBL:
 PPPSD_VERIFY:
 PPPSD_FORMAT:
 PPPSD_DEFMED:
-	CALL	SYSCHK			; INVALID SUB-FUNCTION
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)		; INVALID SUB-FUNCTION
 	RET
 ;
 ;
--- a/Source/HBIOS/prp.asm
+++ b/Source/HBIOS/prp.asm
@ -211,9 +211,7 @@ PRPCON_OST1:
 ;
 ;
 PRPCON_INITDEV:
-	CALL	SYSCHK
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)
 	RET
 ;
 ;
@ -401,9 +399,7 @@ PRPSD_FNTBL:
 PRPSD_VERIFY:
 PRPSD_FORMAT:
 PRPSD_DEFMED:
-	CALL	SYSCHK			; INVALID SUB-FUNCTION
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)		; INVALID SUB-FUNCTION
 	RET
 ;
 ;
--- a/Source/HBIOS/rf.asm
+++ b/Source/HBIOS/rf.asm
@ -138,9 +138,7 @@ RF_FNTBL:
 RF_VERIFY:
 RF_FORMAT:
 RF_DEFMED:
-	CALL	SYSCHK			; INVALID SUB-FUNCTION
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)		; INVALID SUB-FUNCTION
 	RET
 ;
 ;
--- a/Source/HBIOS/sd.asm
+++ b/Source/HBIOS/sd.asm
@ -710,9 +710,7 @@ SD_FNTBL:
 SD_VERIFY:
 SD_FORMAT:
 SD_DEFMED:
-	CALL	SYSCHK			; INVALID SUB-FUNCTION
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)		; INVALID SUB-FUNCTION
 	RET
 ;
 ;
@ -1131,7 +1129,9 @@ SD_INITCARD5:
 	JR	SD_INITCARD6		; HANDLE MMC OR SDSC
 ;	
 SD_INITCARD5A:
-	CALL	SYSCHK
+	PUSH	AF
+	SYSCHKERR(ERR_NOMEDIA)
+	POP	AF
 	JP	SD_NOMEDIA
 ;
 ; CAPACITY CALCULATION FOR MMC OR SDSC (V1) CARDS:
--- a/Source/HBIOS/tms.asm
+++ b/Source/HBIOS/tms.asm
@ -298,9 +298,7 @@ TMS_VDADEV:
 	RET

 TMS_VDASCS:
-	CALL	SYSCHK		; NOT IMPLEMENTED (YET)
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)		; NOT IMPLEMENTED (YET)
 	RET

 TMS_VDASCP:
--- a/Source/HBIOS/vga.asm
+++ b/Source/HBIOS/vga.asm
@ -211,9 +211,7 @@ VGA_VDADEV:
 	RET

 VGA_VDASCS:
-	CALL	SYSCHK		; NOT IMPLEMENTED (YET)
-	LD	A,ERR_NOTIMPL
-	OR	A
+	SYSCHKERR(ERR_NOTIMPL)	; NOT IMPLEMENTED (YET)
 	RET

 VGA_VDASCP: