From cea46daba9c532d0b36939c23de76d468e1897ee Mon Sep 17 00:00:00 2001
From: b1ackmai1er <difficultylevelhigh@gmail.com>
Date: Sun, 3 May 2020 21:59:45 +0800
Subject: [PATCH] replace ay driver with ay38910

---
 Source/HBIOS/Config/RCZ80_std.asm |   2 -
 Source/HBIOS/ay.asm               | 122 ------------------------------
 Source/HBIOS/cfg_dyno.asm         |  13 ++--
 Source/HBIOS/cfg_ezz80.asm        |  13 ++--
 Source/HBIOS/cfg_master.asm       |  13 ++--
 Source/HBIOS/cfg_mk4.asm          |  13 ++--
 Source/HBIOS/cfg_n8.asm           |  13 ++--
 Source/HBIOS/cfg_rcz180.asm       |  13 ++--
 Source/HBIOS/cfg_rcz80.asm        |  13 ++--
 Source/HBIOS/cfg_sbc.asm          |  13 ++--
 Source/HBIOS/cfg_scz180.asm       |  13 ++--
 Source/HBIOS/cfg_zeta.asm         |  12 ++-
 Source/HBIOS/cfg_zeta2.asm        |  12 ++-
 Source/HBIOS/hbios.asm            |  14 +---
 14 files changed, 56 insertions(+), 223 deletions(-)
 delete mode 100644 Source/HBIOS/ay.asm

diff --git a/Source/HBIOS/Config/RCZ80_std.asm b/Source/HBIOS/Config/RCZ80_std.asm
index cf63ad1b..b0441884 100644
--- a/Source/HBIOS/Config/RCZ80_std.asm
+++ b/Source/HBIOS/Config/RCZ80_std.asm
@@ -38,5 +38,3 @@ FDMODE		.SET	FDMODE_RCWDC	; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3
 IDEENABLE	.SET	TRUE		; IDE: ENABLE IDE DISK DRIVER (IDE.ASM)
 ;
 PPIDEENABLE	.SET	TRUE		; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM)
-;
-SN76489ENABLE	.SET	FALSE		; SN76489 SOUND DRIVER
diff --git a/Source/HBIOS/ay.asm b/Source/HBIOS/ay.asm
deleted file mode 100644
index 6c03d2eb..00000000
--- a/Source/HBIOS/ay.asm
+++ /dev/null
@@ -1,122 +0,0 @@
-;
-;======================================================================
-; PSG AY-3-8910 DRIVER FOR CONSOLE BELL
-; WILL ALSO WORK WITH YM2149
-;======================================================================
-;
-#IF (AYMODE == AYMODE_SCG)
-AY_RSEL		.EQU	$9A
-AY_RDAT		.EQU	$9B
-AY_ACR		.EQU	$9C
-#ENDIF
-;
-#IF (AYMODE == AYMODE_N8)
-AY_RSEL		.EQU	$9C
-AY_RDAT		.EQU	$9D
-AY_ACR		.EQU	N8_DEFACR
-#ENDIF
-;
-#IF (AYMODE == AYMODE_RCZ80)
-AY_RSEL		.EQU	$D8
-AY_RDAT		.EQU	$D0
-#ENDIF
-;
-#IF (AYMODE == AYMODE_RCZ180)
-AY_RSEL		.EQU	$68
-AY_RDAT		.EQU	$60
-#ENDIF
-;
-AY_R0CHAP	.EQU	$00
-AY_R1CHAP	.EQU	$01
-AY_R2CHBP	.EQU	$02
-AY_R3CHBP	.EQU	$03
-AY_R7ENAB	.EQU	$07
-AY_R8AVOL	.EQU	$08
-AY_R9BVOL	.EQU	$09 
-;
-;======================================================================
-; PSG AY-3-8910 DRIVER - INITIALIZATION
-;======================================================================
-;
-AY_INIT:
-	CALL	NEWLINE			; FORMATTING
-	PRTS("AY: IO=0x$")
-	LD	A,AY_RSEL
-	CALL	PRTHEXBYTE
-	CALL	AY_PROBE		; CHECK FOR HW EXISTENCE
-	JR	Z,AY_INIT1		; CONTINUE IF PRESENT
-;
-;	HARDWARE NOT PRESENT
-;
-	PRTS(" NOT PRESENT$")
-	OR	$FF			; SIGNAL FAILURE
-	RET
-;	
-AY_INIT1:
-	CALL	AY_INIT2
-	CALL	AY_BEEP
-AY_INIT2:
-	LD	D,AY_R7ENAB		; SET MIXER CONTROL / IO ENABLE
-	LD	E,$F8			; $FF - 11 111 111
-	CALL	AY_WRTPSG		; I/O PORTS DISABLED, NOISE CHANNEL C, B, A DISABLE, TONE CHANNEL C, B, A ENABLE
-;  
-	LD	B,3
-	LD	D,AY_R8AVOL		; SET VOLUME TO 0
-	LD	E,$00	
-AY_QUIET:
-	CALL	AY_WRTPSG		; CYCLING THROUGH ALL CHANNELS
-	INC	A
-	DJNZ	AY_QUIET
-	RET
-;
-;	PLAY A BEEP TONE ON CENTER CHANNEL (LEFT AND RIGHT SPEAKERS)
-;	
-AY_BEEP:
-	LD	D,AY_R2CHBP		; SET TONE PERIOD 
-	LD	E,$55			; CHANNEL B  - R02 & R03
-	CALL	AY_WRTPSG		; $0055 = XXXX0000 01010101 
-	LD	D,AY_R3CHBP
-	LD	E,0
-	CALL	AY_WRTPSG
-;
-	LD	D,AY_R7ENAB		; $FD = 11 111 101
-	LD	E,$FD			; SET MIXER CONTROL / IO ENABLE
-	CALL	AY_WRTPSG		; I/O PORTS DISABLED, NOISE CHANNEL C, B, A DISABLE, TONE CHANNEL B ENABLE
-;  
-	LD	D,AY_R9BVOL
-	LD	E,$07			; SET CHANNEL B VOLUME TO 50% (7/16)
-	CALL	AY_WRTPSG
-;  
-	CALL	LDELAY			; HALF SECOND 
-	RET	
-;	
-; WRITE DATA E TO PSG REG D  
-; 
-AY_WRTPSG:
-	HB_DI
-#IF (CPUFAM == CPU_Z180)
-	IN0	A,(Z180_DCNTL)		; GET WAIT STATES
-	PUSH	AF			; SAVE VALUE
-	OR	%00110000		; FORCE SLOW OPERATION (I/O W/S=3)
-	OUT0	(Z180_DCNTL),A		; AND UPDATE DCNTL
-#ENDIF
-	LD	A,D			; SELECT THE REGISTER WE 
-	OUT	(AY_RSEL),A		; WANT TO WRITE TO
-	LD	A,E			; WRITE THE VALUE TO
-	OUT	(AY_RDAT),A		; THE SELECTED REGISTER
-#IF (CPUFAM == CPU_Z180)
-	POP	AF			; GET SAVED DCNTL VALUE
-	OUT0	(Z180_DCNTL),A		; AND RESTORE IT
-#ENDIF
-	HB_EI
-	RET	
-;
-; CHECK THERE IS A DEVICE PRESENT
-;
-AY_PROBE:
-#IF ((AYMODE == AYMODE_SCG) | (AYMODE == AYMODE_N8))
-	LD	A,$FF
-	OUT	(AY_ACR),A		; INIT AUX CONTROL REG
-#ENDIF
-	XOR	A
-	RET
diff --git a/Source/HBIOS/cfg_dyno.asm b/Source/HBIOS/cfg_dyno.asm
index 681ed38f..058816cd 100644
--- a/Source/HBIOS/cfg_dyno.asm
+++ b/Source/HBIOS/cfg_dyno.asm
@@ -93,11 +93,6 @@ TMSENABLE	.EQU	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_RCZ180	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -157,7 +152,9 @@ PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS
 PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_RCZ180	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_ezz80.asm b/Source/HBIOS/cfg_ezz80.asm
index 5e9eab86..9319a4b5 100644
--- a/Source/HBIOS/cfg_ezz80.asm
+++ b/Source/HBIOS/cfg_ezz80.asm
@@ -118,11 +118,6 @@ TMSENABLE	.EQU	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_RCZ80	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -182,7 +177,9 @@ PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS
 PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_RCZ80	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_master.asm b/Source/HBIOS/cfg_master.asm
index 3ec6f45f..31ff520a 100644
--- a/Source/HBIOS/cfg_master.asm
+++ b/Source/HBIOS/cfg_master.asm
@@ -156,11 +156,6 @@ TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 VGASIZ		.EQU	V80X25		; VGA: DISPLAY FORMAT [V80X25|V80X30|V80X43]
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_NONE	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -237,7 +232,9 @@ PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
 UFBASE		.EQU	$0C		; UF: REGISTERS BASE ADR
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_NONE	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_mk4.asm b/Source/HBIOS/cfg_mk4.asm
index 4b7fb617..6817d124 100644
--- a/Source/HBIOS/cfg_mk4.asm
+++ b/Source/HBIOS/cfg_mk4.asm
@@ -111,11 +111,6 @@ TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 VGASIZ		.EQU	V80X25		; VGA: DISPLAY FORMAT [V80X25|V80X30|V80X43]
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_SCG	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -191,7 +186,9 @@ PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
 UFBASE		.EQU	$0C		; UF: REGISTERS BASE ADR
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_SCG	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_n8.asm b/Source/HBIOS/cfg_n8.asm
index 9b80a5a9..bbcc60fc 100644
--- a/Source/HBIOS/cfg_n8.asm
+++ b/Source/HBIOS/cfg_n8.asm
@@ -114,11 +114,6 @@ TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 VGASIZ		.EQU	V80X25		; VGA: DISPLAY FORMAT [V80X25|V80X30|V80X43]
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	TRUE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_N8	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -191,7 +186,9 @@ PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
 FIFO_BASE	.EQU	$0C		; UF: REGISTERS BASE ADR
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	TRUE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_N8	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_rcz180.asm b/Source/HBIOS/cfg_rcz180.asm
index cceca22f..8fc7d329 100644
--- a/Source/HBIOS/cfg_rcz180.asm
+++ b/Source/HBIOS/cfg_rcz180.asm
@@ -121,11 +121,6 @@ TMSENABLE	.EQU	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_RCZ180	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -191,7 +186,9 @@ PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS
 PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_RCZ180	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_rcz80.asm b/Source/HBIOS/cfg_rcz80.asm
index f39ca40a..3d279a45 100644
--- a/Source/HBIOS/cfg_rcz80.asm
+++ b/Source/HBIOS/cfg_rcz80.asm
@@ -127,11 +127,6 @@ TMSENABLE	.EQU	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_RCZ80	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -197,7 +192,9 @@ PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS
 PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_RCZ80	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_sbc.asm b/Source/HBIOS/cfg_sbc.asm
index f7def400..7803b1a0 100644
--- a/Source/HBIOS/cfg_sbc.asm
+++ b/Source/HBIOS/cfg_sbc.asm
@@ -115,11 +115,6 @@ TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 VGASIZ		.EQU	V80X25		; VGA: DISPLAY FORMAT [V80X25|V80X30|V80X43]
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_SCG	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -193,7 +188,9 @@ PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
 UFBASE		.EQU	$0C		; UF: REGISTERS BASE ADR
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_SCG	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_scz180.asm b/Source/HBIOS/cfg_scz180.asm
index 44d10d5b..483f043f 100644
--- a/Source/HBIOS/cfg_scz180.asm
+++ b/Source/HBIOS/cfg_scz180.asm
@@ -116,11 +116,6 @@ TMSENABLE	.EQU	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-AYMODE		.EQU	AYMODE_RCZ180	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -186,7 +181,9 @@ PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS
 PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_RCZ180	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_zeta.asm b/Source/HBIOS/cfg_zeta.asm
index 95670c4e..8898ceea 100644
--- a/Source/HBIOS/cfg_zeta.asm
+++ b/Source/HBIOS/cfg_zeta.asm
@@ -91,10 +91,6 @@ TMSENABLE	.EQU	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -137,7 +133,9 @@ PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS
 PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_NONE	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/cfg_zeta2.asm b/Source/HBIOS/cfg_zeta2.asm
index ee5b4b2d..28ab8d69 100644
--- a/Source/HBIOS/cfg_zeta2.asm
+++ b/Source/HBIOS/cfg_zeta2.asm
@@ -101,10 +101,6 @@ TMSENABLE	.EQU	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.EQU	FALSE		; TMS: INTERRUPTS NOT ENABLED
 VGAENABLE	.EQU	FALSE		; VGA: ENABLE VGA VIDEO/KBD DRIVER (VGA.ASM)
 ;
-SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
-;
-AYENABLE	.EQU	FALSE		; AY: ENABLE AY PSG SOUND DRIVER
-;
 MDENABLE	.EQU	TRUE		; MD: ENABLE MEMORY (ROM/RAM) DISK DRIVER (MD.ASM)
 MDTRACE		.EQU	1		; MD: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
@@ -147,7 +143,9 @@ PIO_ZP		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR ECB ZILOG PERIPHERALS
 PPI_SBC		.EQU	FALSE		; PIO: ENABLE PARALLEL PORT DRIVER FOR 8255 CHIP
 ;
 UFENABLE	.EQU	FALSE		; UF: ENABLE ECB USB FIFO DRIVER (UF.ASM)
-
-SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
-AY38910ENABLE	.EQU	FALSE		; AY-3-8910 SOUND DRIVER
+;
 AUDIOTRACE	.EQU	FALSE		; ENABLE TRACING TO CONSOLE OF SOUND DRIVER
+SN76489ENABLE	.EQU	FALSE		; SN76489 SOUND DRIVER
+AY38910ENABLE	.EQU	FALSE		; AY: AY-3-8910 / YM2149 SOUND DRIVER
+AYMODE		.EQU	AYMODE_NONE	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
+SPKENABLE	.EQU	FALSE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 9a4c5073..0f0fa77f 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1671,14 +1671,11 @@ HB_INITTBL:
 #IF (SPKENABLE)
 	.DW	SPK_INIT		; AUDIBLE INDICATOR OF BOOT START
 #ENDIF
-#IF (AYENABLE)
-	.DW	AY_INIT			; AUDIBLE INDICATOR OF BOOT START
-#ENDIF
 #IF (SN76489ENABLE)
 	.DW	SN76489_INIT
 #ENDIF
 #IF (AY38910ENABLE)
-	.DW	AY38910_INIT
+	.DW	AY38910_INIT		; AUDIBLE INDICATOR OF BOOT START
 #ENDIF
 #IF (ASCIENABLE)
 	.DW	ASCI_INIT
@@ -3313,15 +3310,6 @@ SIZ_SPK	.EQU	$ - ORG_SPK
 		.ECHO	" bytes.\n"
 #ENDIF
 ;
-#IF (AYENABLE)
-ORG_AY	.EQU	$
-  #INCLUDE "ay.asm"
-SIZ_AY	.EQU	$ - ORG_AY
-		.ECHO	"AY occupies "
-		.ECHO	SIZ_AY
-		.ECHO	" bytes.\n"
-#ENDIF
-;
 #IF (PIO_4P | PIO_ZP | PPI_SBC)
 ORG_PIO		.EQU	$
   #INCLUDE "pio.asm"