diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index da921f2f..c586badc 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -1625,12 +1625,12 @@ HB_PCINITTBL: #IF (ASCIENABLE) .DW ASCI_PREINIT #ENDIF -#IF (DUARTENABLE) - .DW DUART_PREINIT -#ENDIF #IF (UARTENABLE) .DW UART_PREINIT #ENDIF +#IF (DUARTENABLE) + .DW DUART_PREINIT +#ENDIF #IF (SIOENABLE) .DW SIO_PREINIT #ENDIF @@ -1662,12 +1662,12 @@ HB_INITTBL: #IF (ASCIENABLE) .DW ASCI_INIT #ENDIF -#IF (DUARTENABLE) - .DW DUART_INIT -#ENDIF #IF (UARTENABLE) .DW UART_INIT #ENDIF +#IF (DUARTENABLE) + .DW DUART_INIT +#ENDIF #IF (SIOENABLE) .DW SIO_INIT #ENDIF @@ -2991,15 +2991,6 @@ SIZ_ASCI .EQU $ - ORG_ASCI .ECHO " bytes.\n" #ENDIF ; -#IF (DUARTENABLE) -ORG_DUART .EQU $ - #INCLUDE "duart.asm" -SIZ_DUART .EQU $ - ORG_DUART - .ECHO "DUART occupies " - .ECHO SIZ_DUART - .ECHO " bytes.\n" -#ENDIF -; #IF (UARTENABLE) ORG_UART .EQU $ #INCLUDE "uart.asm" @@ -3009,6 +3000,15 @@ SIZ_UART .EQU $ - ORG_UART .ECHO " bytes.\n" #ENDIF ; +#IF (DUARTENABLE) +ORG_DUART .EQU $ + #INCLUDE "duart.asm" +SIZ_DUART .EQU $ - ORG_DUART + .ECHO "DUART occupies " + .ECHO SIZ_DUART + .ECHO " bytes.\n" +#ENDIF +; #IF (SIOENABLE) ORG_SIO .EQU $ #INCLUDE "sio.asm" @@ -3913,7 +3913,7 @@ PS_FLP_DSTR: .TEXT "SD$" ; PS_FLPSD ; PS_SDSTRREF: .DW PS_SDUART, PS_SDASCI, PS_SDTERM - .DW PS_SDPRPCON, PS_SDPPPCON, PS_SDSIO, PS_SDACIA, PS_SDPIO,PS_SDUF + .DW PS_SDPRPCON, PS_SDPPPCON, PS_SDSIO, PS_SDACIA, PS_SDPIO,PS_SDUF,PS_SDDUART ; PS_SDUART .TEXT "UART$" PS_SDASCI .TEXT "ASCI$" @@ -3924,6 +3924,7 @@ PS_SDSIO .TEXT "SIO$" PS_SDACIA .TEXT "ACIA$" PS_SDPIO .TEXT "PORT$" PS_SDUF .TEXT "UF$" +PS_SDDUART .TEXT "DUART$" ; ; CHARACTER SUB TYPE STRINGS ;