Minor Cleanup

Source/HBIOS/cvdu.asm

@@ -27,6 +27,9 @@ CVDU_DATA	.EQU	CVDU_BASE + $0C	; READ/WRITE M8563 DATA
 CVDU_ROWS	.EQU	25
 CVDU_COLS	.EQU	80
 ;
+#DEFINE USEFONT8X16
+#DEFINE	CVDU_FONT FONT8X16
+;
 TERMENABLE	.SET	TRUE		; INCLUDE TERMINAL PSEUDODEVICE DRIVER
 ;
 ;======================================================================
@@ -360,7 +363,7 @@ CVDU_LOADFONT:
 	LD	C,18			; UPDATE ADDRESS REGISTER PAIR
 	CALL	CVDU_WRX		; DO IT
 
-#IF USEZLSA2
+#IF USELZSA2
 	LD	(CVDU_STACK),SP		; SAVE STACK
 	LD	HL,(CVDU_STACK)		; AND SHIFT IT
 	LD	DE,$2000		; DOWN 4KB TO
@@ -387,7 +390,7 @@ CVDU_LOADFONT1:
 	OR	E			; FOR COUNTER EXHAUSTED
 	JR	NZ,CVDU_LOADFONT1	; LOOP TILL DONE
 
-#IF USEZLSA2
+#IF USELZSA2
 	LD	HL,(CVDU_STACK)		; ERASE DECOMPRESS BUFFER
 	LD	SP,HL			; BY RESTORING THE STACK
 	RET				; DONE

Source/HBIOS/hbios.asm

@@ -2929,59 +2929,43 @@ SIZ_NEC	.EQU	$ - ORG_NEC
 ;
 ; FONTS AREA
 ;
-ORG_FONTHI		.EQU	$
+ORG_FONTS	.EQU	$
 ;
-; DO WE NEED AN 8X16 FONT?
+	.ECHO	"FONTS"
 ;
-#IF ((VGAENABLE | CVDUENABLE))
- #IF (VGAENABLE & ((VGASIZ=V80X25) | (VGASIZ=V80X30)))
-VGA_FONT:
- #ENDIF
- #IF (CVDUENABLE)
-CVDU_FONT:
- #ENDIF
-  #IF USEZLSA2
-   #INCLUDE "font8x16c.asm"
+#IFDEF USEFONT8X8
+FONT8X8:
+  #IF USELZSA2
+    #INCLUDE "font8x8c.asm"
   #ELSE 
-   #INCLUDE "font8x16u.asm" 
+    #INCLUDE "font8x8u.asm" 
   #ENDIF
-  .ECHO "8X16 " 
+	.ECHO	" 8X8"
 #ENDIF
 ;
-; DO WE NEED AN 8X11 FONT?
-;
-#IF (VGAENABLE)
- #IF (VGASIZ=V80X43))
-VGA_FONT:
-  #IF USEZLSA2
-   #INCLUDE "font8x11c.asm"
+#IFDEF USEFONT8X11
+FONT8X11:
+  #IF USELZSA2
+    #INCLUDE "font8x11c.asm"
   #ELSE 
-   #INCLUDE "font8x11u.asm" 
+    #INCLUDE "font8x11u.asm" 
   #ENDIF
-   .ECHO "8X11 "
- #ENDIF
+	.ECHO	" 8X11"
 #ENDIF
 ;
-; DO WE NEED AN 8X8 FONT?
-;
-#IF (VGAENABLE | TMSENABLE)
- #IF ((VGAENABLE & (VGASIZ=V80X60)))
-VGA_FONT:
- #ENDIF
- #IF (TMSENABLE)
-TMS_FONT:
- #ENDIF
-  #IF USEZLSA2
-   #INCLUDE "font8x8c.asm"
+#IFDEF USEFONT8X16
+FONT8X16:
+  #IF USELZSA2
+    #INCLUDE "font8x16c.asm"
   #ELSE 
-   #INCLUDE "font8x8u.asm" 
+    #INCLUDE "font8x16u.asm" 
   #ENDIF
-  .ECHO "8X8 " 
+	.ECHO	" 8X16"
 #ENDIF
 ;
-SIZ_FONTHI	.EQU	$ - ORG_FONTHI
-		.ECHO	"FONTS occupy "
-		.ECHO	SIZ_FONTHI
+SIZ_FONTS	.EQU	$ - ORG_FONTS
+		.ECHO	" occupy "
+		.ECHO	SIZ_FONTS
 		.ECHO	" bytes.\n"
 ;
 #IF (CVDUENABLE | VGAENABLE)
@@ -3156,9 +3140,9 @@ SIZ_CTC	.EQU	$ - ORG_CTC
 #INCLUDE "dsky.asm"
 #ENDIF
 ;
-; INCLUDE ZLSA2 decompression engine if required.
+; INCLUDE LZSA2 decompression engine if required.
 ;
-#IF ((VGAENABLE | CVDUENABLE | TMSENABLE) & USEZLSA2)
+#IF ((VGAENABLE | CVDUENABLE | TMSENABLE) & USELZSA2)
 #INCLUDE "unlzsa2s.asm"
 #ENDIF
 ;

Source/HBIOS/std.asm

@@ -298,7 +298,7 @@ V80X60		.EQU	6	; ECB-VGA3
 ;
 ; FONTS
 ;
-USEZLSA2	.EQU	FALSE	; USE COMPRESSED FONTS.
+USELZSA2	.EQU	FALSE	; USE COMPRESSED FONTS.
 ;
 ; KEYBOARD LAYOUTS
 ;

Source/HBIOS/tms.asm

@@ -42,6 +42,9 @@ TMS_PPIX	.EQU	0		; PPI CONTROL PORT
 TMS_ROWS	.EQU	24
 TMS_COLS	.EQU	40
 ;
+#DEFINE USEFONT8X8
+#DEFINE	TMS_FONT FONT8X8
+;
 TERMENABLE	.SET	TRUE		; INCLUDE TERMINAL PSEUDODEVICE DRIVER
 ;
 ; TMS_IODELAY IS USED TO ADD RECOVERY TIME TO TMS9918 ACCESSES
@@ -367,7 +370,7 @@ TMS_LOADFONT:
 	LD	HL,$800
 	CALL	TMS_WR
 
-#IF USEZLSA2
+#IF USELZSA2
 	LD	(TMS_STACK),SP		; SAVE STACK
 	LD	HL,(TMS_STACK)		; AND SHIFT IT
 	LD	DE,$2000		; DOWN 4KB TO
@@ -395,7 +398,7 @@ TMS_LOADFONT1:
 	OR	E
 	JR	NZ,TMS_LOADFONT1
 ;
-#IF USEZLSA2
+#IF USELZSA2
 	LD	HL,(TMS_STACK)		; ERASE DECOMPRESS BUFFER
 	LD	SP,HL			; BY RESTORING THE STACK
 	RET				; DONE

Source/HBIOS/vga.asm

@@ -41,24 +41,32 @@ VGA_ROWS	.EQU	25
 VGA_COLS	.EQU	80
 VGA_SCANL	.EQU	16
 VGA_89BIT	.EQU	VGA_8BIT
+#DEFINE USEFONT8X16
+#DEFINE	VGA_FONT FONT8X16
 #ENDIF
 #IF (VGASIZ=V80X30)
 VGA_ROWS	.EQU	30
 VGA_COLS	.EQU	80
 VGA_SCANL	.EQU	16
 VGA_89BIT	.EQU	VGA_8BIT
+#DEFINE USEFONT8X16
+#DEFINE	VGA_FONT FONT8X16
 #ENDIF
 #IF (VGASIZ=V80X43)
 VGA_ROWS	.EQU	43
 VGA_COLS	.EQU	80
 VGA_SCANL	.EQU	11
 VGA_89BIT	.EQU	VGA_8BIT
+#DEFINE USEFONT8X11
+#DEFINE	VGA_FONT FONT8X11
 #ENDIF
 #IF (VGASIZ=V80X60)
 VGA_ROWS	.EQU	60
 VGA_COLS	.EQU	80
 VGA_SCANL	.EQU	8
 VGA_89BIT	.EQU	VGA_8BIT
+#DEFINE USEFONT8X8
+#DEFINE	VGA_FONT FONT8X8
 #ENDIF
 ;
 #IF VGA_CSTY=VGA_BLOK
@@ -510,7 +518,7 @@ VGA_LOADFONT:
 	LD	HL,$7000 | VGA_89BIT	; CLEAR FONT PAGE NUM
 	CALL	VGA_SETCFG
 
-#IF USEZLSA2
+#IF USELZSA2
 	LD	(VGA_STACK),SP		; SAVE STACK
 	LD	HL,(VGA_STACK)		; AND SHIFT IT
 	LD	DE,$2000		; DOWN 4KB TO
@@ -547,7 +555,7 @@ VGA_LOADFONT2:
 	LD	HL,$7070 | VGA_89BIT	; SET FONT PAGE NUM TO 7
 	CALL	VGA_SETCFG
 
-#IF USEZLSA2
+#IF USELZSA2
 	LD	HL,(VGA_STACK)		; ERASE DECOMPRESS BUFFER
 	LD	SP,HL			; BY RESTORING THE STACK
 	RET				; DONE