From 4cd533117f20b01f3c992ce5cb94f0fddffd8ef1 Mon Sep 17 00:00:00 2001
From: b1ackmai1er <difficultylevelhigh@gmail.com>
Date: Tue, 6 Dec 2022 20:18:19 +0800
Subject: [PATCH] ym2612 updates

---
 Source/HBIOS/hbios.asm  |  8 ++++++++
 Source/HBIOS/ym2612.asm | 28 ++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 94c9a235..e02c525a 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -6176,6 +6176,14 @@ SIZ_AY38910	.EQU	$ - ORG_AY38910
 		.ECHO	SIZ_AY38910
 		.ECHO	" bytes.\n"
 #ENDIF
+#IF (YM2612ENABLE)
+ORG_YM2612	.EQU	$
+  #INCLUDE "ym2612.asm"
+SIZ_YM2612	.EQU	$ - ORG_YM2612
+		.ECHO	"YM2612 occupies "
+		.ECHO	SIZ_YM2612
+		.ECHO	" bytes.\n"
+#ENDIF
 ;
 		.ECHO	"RTCDEF="
 		.ECHO	RTCDEF
diff --git a/Source/HBIOS/ym2612.asm b/Source/HBIOS/ym2612.asm
index 9346de1a..9ceadf4d 100644
--- a/Source/HBIOS/ym2612.asm
+++ b/Source/HBIOS/ym2612.asm
@@ -15,6 +15,8 @@ YMDAT		.EQU	VGMBASE+01H		; Primary YM2162 11000001 a1=0 a0=1
 YM2SEL		.EQU	VGMBASE+02H		; Secondary YM2162 11000010 a1=1 a0=0
 YM2DAT		.EQU	VGMBASE+03H		; Secondary YM2162 11000011 a1=1 a0=1
 ;
+YM_CLR		.EQU	FALSE			; Set to clear all registers
+;
 ;------------------------------------------------------------------------------
 ; YM2162 Mute
 ;------------------------------------------------------------------------------
@@ -45,20 +47,30 @@ set1:		ld	a,(hl)			; YM2162 Register write
 		ld	a,(hl)
 		inc	hl
 		out	(YMDAT),a
-set1a:		in	a,(YMSEL)
-		rlca
-		jp	c,set1a
+		push	bc
+		ld	b,0			; check
+set1a:		in	a,(YMSEL)       	; device
+		rlca                    	; ready
+		jp	nc,set1b        	; with
+		djnz	set1a           	; timeout
+		; timed out
+set1b:		pop	bc
 		ret
-
+;
 set2:		ld	a,(hl)			; YM2162 Register write
 		inc	hl			; Register Bank [2]
 		out	(YM2SEL),a
 		ld	a,(hl)
 		inc	hl
 		out	(YM2DAT),a
-set2a:		in	a,(YM2SEL)
-		rlca
-		jp	c,set2a
+		push	bc			; check
+		ld	b,0			; device
+set2a:		in	a,(YM2SEL)		; ready
+		rlca				; with
+		jp	nc,set2b		; timeout
+		djnz	set2a
+		; timed out
+set2b:		pop	bc
 		ret
 
 s1:		.db	$22,$00			; [1] lfo off
@@ -106,7 +118,7 @@ s4:
 		.db	$4d,$7f			; [2]
 		.db	$4e,$7f			; [2]
 s5:
-#IF (0)
+#IF (YM_CLR)
 		.db	$2a,$00			; [1]	; dac value
  
 		.db	$24,$00			; [1]	; timer A frequency