From 639f05d07c26e5724741eff879f1144201f49c73 Mon Sep 17 00:00:00 2001
From: Kagamiin~ <kagamiin@riseup.net>
Date: Sat, 23 Mar 2024 01:09:49 -0300
Subject: [PATCH] Small fixes

---
 src/sound/snd_sb.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c
index fc6b9c6e9..61dbc8c7a 100644
--- a/src/sound/snd_sb.c
+++ b/src/sound/snd_sb.c
@@ -1523,7 +1523,7 @@ ess_mixer_write(uint16_t addr, uint8_t val, void *priv)
                         uint16_t mpu401_base_addr = 0x300 | ((mixer->regs[0x40] << 1) & 0x30);
                         gameport_remap(ess->gameport, !(mixer->regs[0x40] & 0x2) ? 0x00 : 0x200);
 
-                        if (0) {
+                        if (ess->dsp.sb_subtype != SB_SUBTYPE_ESS_ES1688) {
                             /* Not on ES1688. */
                             io_removehandler(0x0388, 0x0004,
                                              ess->opl.read, NULL, NULL,
@@ -3112,12 +3112,6 @@ sb_awe32_pnp_init(const device_t *info)
 static void *
 ess_1688_init(UNUSED(const device_t *info))
 {
-    /* SB Pro 2 port mappings, 220h or 240h.
-       2x0 to 2x3 -> FM chip (18 voices)
-       2x4 to 2x5 -> Mixer interface
-       2x6, 2xA, 2xC, 2xE -> DSP chip
-       2x8, 2x9, 388 and 389 FM chip (9 voices)
-       2x0+10 to 2x0+13 CDROM interface. */
     sb_t    *ess  = calloc(sizeof(sb_t), 1);
     uint16_t addr = device_get_config_hex16("base");
 
@@ -4462,17 +4456,17 @@ static const device_config_t ess_1688_config[] = {
                 .description = "0x220",
                 .value       = 0x220
             },
+            {
+                .description = "0x230",
+                .value       = 0x230
+            },
             {
                 .description = "0x240",
                 .value       = 0x240
             },
             {
-                .description = "0x260",
-                .value       = 0x260
-            },
-            {
-                .description = "0x280",
-                .value       = 0x280
+                .description = "0x250",
+                .value       = 0x250
             },
             { .description = "" }
         }