diff --git a/Binary/RCZ180_nat.com b/Binary/RCZ180_nat.com new file mode 100644 index 00000000..17029f7c Binary files /dev/null and b/Binary/RCZ180_nat.com differ diff --git a/Source/HBIOS/cfg_mk4.asm b/Source/HBIOS/cfg_mk4.asm index a614407f..24c26947 100644 --- a/Source/HBIOS/cfg_mk4.asm +++ b/Source/HBIOS/cfg_mk4.asm @@ -81,6 +81,7 @@ UARTSBC .EQU FALSE ; UART: AUTO-DETECT SBC/ZETA ONBOARD UART UARTCAS .EQU TRUE ; UART: AUTO-DETECT ECB CASSETTE UART UARTMFP .EQU FALSE ; UART: AUTO-DETECT MF/PIC UART UART4 .EQU TRUE ; UART: AUTO-DETECT 4UART UART +UARTCASSPD .EQU SER_300_8N1 ; ECB CASSETTE UART DEFAULT SPEED ; ASCIENABLE .EQU TRUE ; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM) ASCI0CFG .EQU DEFSERCFG ; ASCI 0: SERIAL LINE CONFIG diff --git a/Source/HBIOS/cfg_n8.asm b/Source/HBIOS/cfg_n8.asm index 22498548..e61adc2d 100644 --- a/Source/HBIOS/cfg_n8.asm +++ b/Source/HBIOS/cfg_n8.asm @@ -84,6 +84,7 @@ UARTSBC .EQU FALSE ; UART: AUTO-DETECT SBC/ZETA ONBOARD UART UARTCAS .EQU TRUE ; UART: AUTO-DETECT ECB CASSETTE UART UARTMFP .EQU FALSE ; UART: AUTO-DETECT MF/PIC UART UART4 .EQU TRUE ; UART: AUTO-DETECT 4UART UART +UARTCASSPD .EQU SER_300_8N1 ; ECB CASSETTE UART DEFAULT SPEED ; ASCIENABLE .EQU TRUE ; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM) ASCI0CFG .EQU DEFSERCFG ; ASCI 0: SERIAL LINE CONFIG diff --git a/Source/HBIOS/cfg_sbc.asm b/Source/HBIOS/cfg_sbc.asm index 54dcea5e..b2f6bd43 100644 --- a/Source/HBIOS/cfg_sbc.asm +++ b/Source/HBIOS/cfg_sbc.asm @@ -75,6 +75,7 @@ UARTSBC .EQU TRUE ; UART: AUTO-DETECT SBC/ZETA ONBOARD UART UARTCAS .EQU TRUE ; UART: AUTO-DETECT ECB CASSETTE UART UARTMFP .EQU TRUE ; UART: AUTO-DETECT MF/PIC UART UART4 .EQU TRUE ; UART: AUTO-DETECT 4UART UART +UARTCASSPD .EQU SER_300_8N1 ; ECB CASSETTE UART DEFAULT SPEED ; ASCIENABLE .EQU FALSE ; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM) ; diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index 6dc70e02..19aa457b 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -932,12 +932,21 @@ HB_START1: ; BNKCALL ARRIVES HERE, BUT NOW RUNNING IN RAM BANK AND 1 ; IS RECOVERY MODE LD (HB_BOOT_REC),A ; SAVE FOR LATER #ENDIF - #IF (BT_REC_TYPE == BT_REC_SBC02) + #IF (BT_REC_TYPE == BT_REC_SBC1B) IN A,(RTCIO) ; RTC PORT, BIT 6 HAS THE BIT 6,A ; STATE OF CONFIG JUMPER LD A,1 ; JUMPER INSTALLED JR Z,SAVE_REC_M ; IS RECOVERY MODE LD A,0 +SAVE_REC_M: + LD (HB_BOOT_REC),A ; SAVE FOR LATER + #ENDIF + #IF (BT_REC_TYPE == BT_REC_SBCRI) + IN A,($68 + 6) ; UART_MSR MODEM + BIT 6,A ; STATUS REGISTER + LD A,0 ; BIT 6 + JR Z,SAVE_REC_M ; IS RECOVERY MODE + LD A,1 SAVE_REC_M: LD (HB_BOOT_REC),A ; SAVE FOR LATER #ENDIF diff --git a/Source/HBIOS/prefix.asm b/Source/HBIOS/prefix.asm index 0916b3ef..0aa2ac2f 100644 --- a/Source/HBIOS/prefix.asm +++ b/Source/HBIOS/prefix.asm @@ -207,7 +207,7 @@ PR_LOG_UNIT .DW 0 ; ? (PROBABLY UNUSED) ; ; SECOND CHUNK OF METADATA ; -PR_WP .DB 0 ; WRITE PROTECT BOOLEADN +PR_WP .DB 0 ; WRITE PROTECT BOOLEAN PR_UPDSEQ .DW 0 ; PREFIX UPDATE SEQUENCE NUMBER (DEPRECATED?) PR_VER .DB RMJ,RMN,RUP,RTP ; OS BUILD VERSION PR_LABEL .DB "Unlabeled Drive ","$" ; DISK LABEL (EXACTLY 16 BYTES!!!) diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm index 4a51624c..c552b5a3 100644 --- a/Source/HBIOS/std.asm +++ b/Source/HBIOS/std.asm @@ -79,7 +79,8 @@ BT_AUTO .EQU 2 ; AUTO SELECT BOOT_DEFAULT AFTER BOOT_TIMEOUT BT_REC_NONE .EQU 0 ; NO RECOVERY MODE BT_REC_FORCE .EQU 1 ; FORCE BOOT RECOVERY MODE BT_REC_SBC01 .EQU 2 ; ECB-SBCV2 - BIT 1 RTC HIGH -BT_REC_SBC02 .EQU 3 ; ECB-SBCV2 - 1-BIT IO PORT +BT_REC_SBC1B .EQU 3 ; ECB-SBCV2 - 1-BIT IO PORT +BT_REC_SBCRI .EQU 4 ; ECB-SBCV2 - 16550 UART RING INDICATOR LINE ; BT_REC_TYPE .EQU BT_REC_NONE ; BOOT RECOVERY METHOD TO USE ; diff --git a/Source/HBIOS/uart.asm b/Source/HBIOS/uart.asm index b9a72422..d29ccc46 100644 --- a/Source/HBIOS/uart.asm +++ b/Source/HBIOS/uart.asm @@ -584,7 +584,7 @@ UART_CFG: .DB 0 ; UART TYPE .DB $80 ; IO PORT BASE (RBR, THR) .DB $80 + UART_LSR ; LINE STATUS PORT (LSR) - .DW SER_300_8N1 ; LINE CONFIGURATION + .DW UARTCASSPD ; LINE CONFIGURATION .FILL 2,$FF ; FILLER #ENDIF #IF (UARTMFP) diff --git a/Source/HBIOS/uf.asm b/Source/HBIOS/uf.asm index 4b13ecab..efc3d9b3 100644 --- a/Source/HBIOS/uf.asm +++ b/Source/HBIOS/uf.asm @@ -64,7 +64,7 @@ UF_INIT: OR A ; REQUIRES TERMINAL PROGRAM RET NZ ; TO HAVE INITIALIZED PORT CALL PRTSTRD ; ON PC SIDE. - .TEXT "No connection$" + .TEXT " No connection$" RET ; ; INPUT A CHARACTER AND RETURN IT IN E