From 08168681b6ad07db73b434528c9bb6ca0c575c2b Mon Sep 17 00:00:00 2001
From: b1ackmai1er <difficultylevelhigh@gmail.com>
Date: Tue, 21 Feb 2023 19:37:43 +0800
Subject: [PATCH] Update hbios.asm

---
 Source/HBIOS/hbios.asm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 8810942e..81f40c95 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -6570,11 +6570,7 @@ PS_PRTDT:
 	LD	DE,PS_DTHARD
 	LD	A,00111000B
 	CALL	PRTIDXMSK
-
-	LD 	A,(PRTIDXCNT)
-	SUB	18			; 18 CHAR FIELD
-	NEG
-	CALL	PS_PAD			; PAD N SPACES (SPECIFIED IN A)
+	CALL	PS_PAD18		; PAD TO 18 SPACES
 	RET	
 ;
 ; PRINT DISK CAPACITY (UNIT IN C, ATTRIBUTE IN E)
@@ -6686,7 +6682,7 @@ PS_PRTST:
 ; PRINT SERIAL CONFIG (UNIT IN E, ATTRIBUTE IN C)
 ;
 PS_PRTSC:
-	BIT	6,C		; PARALLEL TYPE?
+	BIT	6,C			; PARALLEL TYPE?
 	JR	NZ,PSPRTPC0
 
 	BIT	7,C			; 0=RS-232, 1=TERMINAL
@@ -6870,19 +6866,14 @@ PS_SOUND:
 	LD	B,BF_SNDQUERY		; FUNC=GET DEVICE INFO, UNIT NUM STILL IN C
 	LD	E,BF_SNDQ_DEV
 	RST	08
-	LD	A,B
-	RLCA
-	RLCA
-	RLCA
-	RLCA
-	AND	$0F
+	PUSH	BC
+	LD	C,B
+	LD	A,11110000B		; TYPE IS IN UPPER NIBBLE
 	LD	DE,PS_SDSN76489
-	CALL	PRTIDXDEA
-	LD	A,(PRTIDXCNT)
-	SUB	18			; SUBTRACT FIELD WIDTH
-	NEG				; MAKE IT A POSITIVE NUMBER
-	CALL	PS_PAD			; PAD AS NEEDED
-
+	CALL	PRTIDXMSK
+	CALL	PS_PAD18
+	POP	BC
+;
 	; DEVICE CHARACTERISTICS
 ;
 	LD	B,BF_SNDQUERY		; FUNC=GET DEVICE INFO, UNIT NUM STILL IN C
@@ -6899,6 +6890,7 @@ PS_SOUND:
 ;
 	POP	BC
 	RET
+
 ;
 ; PRINT DEVICE NMEMONIC, DEVTYP/NUM SPECIFIED IN DE
 ;
@@ -6934,6 +6926,14 @@ PS_PRT1:
 	INC	C			; BUMP COUNTER
 	JR	PS_PRT1			; AND LOOP
 ;
+; PAD  18 CHARACTER FIELD
+;
+PS_PAD18:
+	LD	A,(PRTIDXCNT)
+	SUB	18			; SUBTRACT FIELD WIDTH
+	NEG				; MAKE IT A POSITIVE NUMBER
+	JR	PS_PAD			; PAD AS NEEDED
+;
 ; PRINT STRING AT HL IN 18 CHARACTER FIELD
 ;
 PS_PRT18: