diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index e8b74a06..09dd0789 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -1289,16 +1289,34 @@ PSCNX .EQU $ + 1 ; CALL NEWLINE2 PRTX(STR_PLATFORM) +; + LD A,(HB_CPUTYPE) ; GET CPU TYPE + OR A ; SET FLAGS + LD DE,HB_STRZ80 ; Z80 + JR Z,HB_PCPU ; IF Z80, PRINT IT + DEC A ; NEXT CPU TYPE + LD DE,HB_STRZ180 ; Z80180 + JR Z,HB_PCPU ; IF Z80180, PRINT IT + DEC A ; NEXT CPU TYPE + LD DE,HB_STRZS180K ; Z8S180 REV K + JR Z,HB_PCPU ; IF Z8S180-K, PRINT IT + LD DE,HB_STRZS180N ; Z8S180 REV N + JR HB_PCPU ; PRINT Z8S180-N +; +HB_STRZ80 .TEXT " Z80$" +HB_STRZ180 .TEXT " Z80180$" +HB_STRZS180K .TEXT " Z8S180-K$" +HB_STRZS180N .TEXT " Z8S180-N$" +; +HB_PCPU: + CALL WRITESTR ; PRINT IT +; PRTS(" @ $") LD HL,(CB_CPUKHZ) CALL PRTD3M ; PRINT AS DECIMAL WITH 3 DIGIT MANTISSA PRTS("MHz$") ; #IF ((PLATFORM == PLT_N8) | (PLATFORM == PLT_MK4) | (PLATFORM == PLT_RCZ180)) - LD A,(HB_CPUTYPE) ; GET CPU TYPE - PRTS(" REV=$") - ADD A,$30 ; MAKE DISPLAYABLE DIGIT - CALL COUT PRTS(" IO=0x$") LD A,Z180_BASE CALL PRTHEXBYTE @@ -1306,8 +1324,6 @@ PSCNX .EQU $ + 1 ; ; DISPLAY CPU CONFIG ; - ;CALL PRTSTRD - ;.TEXT ", $" CALL NEWLINE #IF ((PLATFORM == PLT_N8) | (PLATFORM == PLT_MK4) | (PLATFORM == PLT_RCZ180)) LD A,Z180_MEMWAIT diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm index 03e00bbf..77f9404c 100644 --- a/Source/HBIOS/std.asm +++ b/Source/HBIOS/std.asm @@ -269,31 +269,31 @@ IVT_PIO3 .EQU 24 ; SET PLATFORM NAME STRING ; #IF (PLATFORM == PLT_SBC) - #DEFINE PLATFORM_NAME "SBC Z80" + #DEFINE PLATFORM_NAME "SBC" #ENDIF #IF (PLATFORM == PLT_ZETA) - #DEFINE PLATFORM_NAME "ZETA Z80" + #DEFINE PLATFORM_NAME "ZETA" #ENDIF #IF (PLATFORM == PLT_ZETA2) - #DEFINE PLATFORM_NAME "ZETA Z80 V2" + #DEFINE PLATFORM_NAME "ZETA V2" #ENDIF #IF (PLATFORM == PLT_N8) - #DEFINE PLATFORM_NAME "N8 Z180" + #DEFINE PLATFORM_NAME "N8" #ENDIF #IF (PLATFORM == PLT_MK4) - #DEFINE PLATFORM_NAME "MARK IV Z180" + #DEFINE PLATFORM_NAME "MARK IV" #ENDIF #IF (PLATFORM == PLT_UNA) #DEFINE PLATFORM_NAME "UNA" #ENDIF #IF (PLATFORM == PLT_RCZ80) - #DEFINE PLATFORM_NAME "RC2014 Z80" + #DEFINE PLATFORM_NAME "RC2014" #ENDIF #IF (PLATFORM == PLT_RCZ180) - #DEFINE PLATFORM_NAME "RC2014 Z180" + #DEFINE PLATFORM_NAME "RC2014" #ENDIF #IF (PLATFORM == PLT_EZZ80) - #DEFINE PLATFORM_NAME "EASY Z80" + #DEFINE PLATFORM_NAME "EASY" #ENDIF ; ; INCLUDE PLATFORM SPECIFIC HARDWARE DEFINITIONS