Fix CONSOLE Constant

Rename CIODEV_CONSOLE constant to CIO_CONSOLE because it is a unit code, not a device type code.

Retabify TastyBasic.
This commit is contained in:
Wayne Warthen
2020-03-15 09:44:15 -07:00
parent 242a1ce108
commit d1abba5378
7 changed files with 1333 additions and 1332 deletions

View File

@@ -192,18 +192,18 @@ LD_UL1 .EQU 0 ; -> LPT1:
#ELSE
LD_TTY .EQU CIODEV_CONSOLE ; -> COM0:
LD_CRT .EQU CIODEV_CONSOLE ; -> CRT:
LD_TTY .EQU CIO_CONSOLE ; -> COM0:
LD_CRT .EQU CIO_CONSOLE ; -> CRT:
LD_BAT .EQU DEV_BAT
LD_UC1 .EQU CIODEV_CONSOLE ; -> COM1:
LD_PTR .EQU CIODEV_CONSOLE ; -> COM1:
LD_UR1 .EQU CIODEV_CONSOLE ; -> COM2:
LD_UR2 .EQU CIODEV_CONSOLE ; -> COM3:
LD_PTP .EQU CIODEV_CONSOLE ; -> COM1:
LD_UP1 .EQU CIODEV_CONSOLE ; -> COM2:
LD_UP2 .EQU CIODEV_CONSOLE ; -> COM3:
LD_LPT .EQU CIODEV_CONSOLE ; -> LPT0:
LD_UL1 .EQU CIODEV_CONSOLE ; -> LPT1:
LD_UC1 .EQU CIO_CONSOLE ; -> COM1:
LD_PTR .EQU CIO_CONSOLE ; -> COM1:
LD_UR1 .EQU CIO_CONSOLE ; -> COM2:
LD_UR2 .EQU CIO_CONSOLE ; -> COM3:
LD_PTP .EQU CIO_CONSOLE ; -> COM1:
LD_UP1 .EQU CIO_CONSOLE ; -> COM2:
LD_UP2 .EQU CIO_CONSOLE ; -> COM3:
LD_LPT .EQU CIO_CONSOLE ; -> LPT0:
LD_UL1 .EQU CIO_CONSOLE ; -> LPT1:
#ENDIF
;

View File

@@ -819,7 +819,7 @@ COUT:
;
; OUTPUT CHARACTER TO CONSOLE VIA HBIOS
LD E,A ; OUTPUT CHAR TO E
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOOUT ; HBIOS FUNC: OUTPUT CHAR
RST 08 ; HBIOS OUTPUTS CHARACTER
;
@@ -842,7 +842,7 @@ CIN:
PUSH HL
;
; INPUT CHARACTER FROM CONSOLE VIA HBIOS
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIN ; HBIOS FUNC: INPUT CHAR
RST 08 ; HBIOS READS CHARACTER
LD A,E ; MOVE CHARACTER TO A FOR RETURN
@@ -865,7 +865,7 @@ CST:
PUSH HL
;
; GET CONSOLE INPUT STATUS VIA HBIOS
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIST ; HBIOS FUNC: INPUT STATUS
RST 08 ; HBIOS RETURNS STATUS IN A
;

View File

@@ -175,7 +175,7 @@ mandel_end ld hl, finished ; Print finished-message
; GET CONSOLE INPUT STATUS VIA HBIOS
waitch
#IF (BIOS == BIOS_WBW)
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIN ; HBIOS FUNC: INPUT CHAR
RST 08 ; DO IT
@@ -215,7 +215,7 @@ _putc
PUSH DE
PUSH HL
LD E,A ; OUTPUT CHAR TO E
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOOUT ; HBIOS FUNC: OUTPUT CHAR
RST 08 ; HBIOS OUTPUTS CHARACTDR
POP HL

View File

@@ -85,6 +85,8 @@ BF_SYSINT_INFO .EQU $00 ; GET INTERRUPT SYSTEM INFO
BF_SYSINT_GET .EQU $10 ; GET INT VECTOR ADDRESS
BF_SYSINT_SET .EQU $20 ; SET INT VECTOR ADDRESS
;
CIO_CONSOLE .EQU $80 ; CIO UNIT NUM FOR CUR CON
;
; CHAR DEVICE IDS
;
CIODEV_UART .EQU $00
@@ -96,7 +98,6 @@ CIODEV_SIO .EQU $50
CIODEV_ACIA .EQU $60
CIODEV_PIO .EQU $70
CIODEV_UF .EQU $80
CIODEV_CONSOLE .EQU $D0
;
; SUB TYPES OF CHAR DEVICES
;

View File

@@ -1349,7 +1349,7 @@ TSTBRK:
PUSH DE
PUSH HL
LD C,CIODEV_CONSOLE; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIST ; HBIOS FUNC: INPUT STATUS
RST 08 ; HBIOS RETURNS STATUS IN A
@@ -1363,7 +1363,7 @@ TSTBRK:
; INPUT CHARACTER FROM CONSOLE VIA HBIOS
LD C,CIODEV_CONSOLE; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIN ; HBIOS FUNC: INPUT CHAR
RST 08 ; HBIOS READS CHARACTDR
LD A,E ; MOVE CHARACTER TO A FOR RETURN
@@ -1387,7 +1387,7 @@ STALL: ; Wait for key
;
; INPUT CHARACTER FROM CONSOLE VIA HBIOS
;
LD C,CIODEV_CONSOLE; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIN ; HBIOS FUNC: INPUT CHAR
RST 08 ; HBIOS READS CHARACTDR
LD A,E ; MOVE CHARACTER TO A FOR RETURN
@@ -4463,7 +4463,7 @@ GETINP:
PUSH BC
PUSH DE
PUSH HL
LD C,CIODEV_CONSOLE; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIN ; HBIOS FUNC: INPUT CHAR
RST 08 ; HBIOS READS CHARACTDR
LD A,E ; MOVE CHARACTER TO A FOR RETURN
@@ -4706,7 +4706,7 @@ MONOUT:
PUSH DE
PUSH HL
LD E,A ; OUTPUT CHAR TO E
LD C,CIODEV_CONSOLE; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOOUT ; HBIOS FUNC: OUTPUT CHAR
RST 08 ; HBIOS OUTPUTS CHARACTDR
POP HL ; RESTORE ALL REGISTERS

View File

@@ -1050,7 +1050,7 @@ COUT:
;
; OUTPUT CHARACTER TO CONSOLE VIA HBIOS
LD E,A ; OUTPUT CHAR TO E
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOOUT ; HBIOS FUNC: OUTPUT CHAR
RST 08 ; HBIOS OUTPUTS CHARACTDR
;
@@ -1070,7 +1070,7 @@ CIN:
PUSH HL
;
; INPUT CHARACTER FROM CONSOLE VIA HBIOS
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIN ; HBIOS FUNC: INPUT CHAR
RST 08 ; HBIOS READS CHARACTDR
LD A,E ; MOVE CHARACTER TO A FOR RETURN
@@ -1090,7 +1090,7 @@ CST:
PUSH HL
;
; GET CONSOLE INPUT STATUS VIA HBIOS
LD C,CIODEV_CONSOLE ; CONSOLE UNIT TO C
LD C,CIO_CONSOLE ; CONSOLE UNIT TO C
LD B,BF_CIOIST ; HBIOS FUNC: INPUT STATUS
RST 08 ; HBIOS RETURNS STATUS IN A
;

File diff suppressed because it is too large Load Diff