# HG changeset patch # User Laurens Holst # Date 1595676319 -7200 # Sat Jul 25 13:25:19 2020 +0200 # Node ID 14802ff424bf7a37e90da1a7b7ea8292f29588ee # Parent 41cba7f43314874814bb3e87dc2f47ba21221602 YM3526/YM3812/YMF262: Also detect DalSoRi R2 explicitly for these chips. It was only detected as such when playing OPL4 music, for other chips it found a regular MoonSound. Not an issue in itself, but could lead to user confusion. diff --git a/src/chips/YM3526.asm b/src/chips/YM3526.asm --- a/src/chips/YM3526.asm +++ b/src/chips/YM3526.asm @@ -57,12 +57,7 @@ call Drivers_TryCreateMSXAudio_IY ld hl,MSXAudio_interface ret c - call Drivers_TryCreateOPL3_IY - ld hl,OPL3_interface - ret c - call Drivers_TryCreateMoonSound_IY - ld hl,MoonSound_interface - ret + jp YM3812_TryCreate ; SECTION RAM diff --git a/src/chips/YM3812.asm b/src/chips/YM3812.asm --- a/src/chips/YM3812.asm +++ b/src/chips/YM3812.asm @@ -53,13 +53,8 @@ ; de <- driver ; hl <- device interface ; f <- c: succeeded -YM3812_TryCreate: - call Drivers_TryCreateOPL3_IY - ld hl,OPL3_interface - ret c - call Drivers_TryCreateMoonSound_IY - ld hl,MoonSound_interface - ret +YM3812_TryCreate: equ YMF262_TryCreate +; jp YMF262_TryCreate ; SECTION RAM diff --git a/src/chips/YMF262.asm b/src/chips/YMF262.asm --- a/src/chips/YMF262.asm +++ b/src/chips/YMF262.asm @@ -79,9 +79,7 @@ call Drivers_TryCreateOPL3_IY ld hl,OPL3_interface ret c - call Drivers_TryCreateMoonSound_IY - ld hl,MoonSound_interface - ret + jp YMF278B_TryCreate ; SECTION RAM