From e4f8485a805cf0a7f3c9241e4e6072da319de381 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Sat, 2 Mar 2024 17:29:05 +0600
Subject: [PATCH] ESS bits for IRQ raise

---
 src/sound/snd_sb_dsp.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/sound/snd_sb_dsp.c b/src/sound/snd_sb_dsp.c
index 1e2d469a2e..c028f98c1b 100644
--- a/src/sound/snd_sb_dsp.c
+++ b/src/sound/snd_sb_dsp.c
@@ -224,6 +224,12 @@ sb_update_status(sb_dsp_t *dsp, int bit, int set)
             break;
     }
 
+    /* TODO: Investigate real hardware for this (the ES1887 datasheet documents this bit somewhat oddly.) */
+    if (dsp->ess_playback_mode && bit <= 1 && set && !masked) {
+        if (!(ESSreg(0xB1) & 0x40)) // if ESS playback, and IRQ disabled, do not fire
+            return;
+    }
+
     if (set && !masked)
         dsp->irq_update(dsp->irq_priv, 1);
     else if (!set)
@@ -377,6 +383,9 @@ sb_start_dma(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
         if (!timer_is_enabled(&dsp->output_timer))
             timer_set_delay_u64(&dsp->output_timer, dsp->sblatcho);
     }
+
+    /* This will be set later for ESS playback/record modes. */
+    dsp->ess_playback_mode = 0;
 }
 
 void
@@ -409,6 +418,32 @@ sb_start_dma_i(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
     memset(dsp->record_buffer, 0, sizeof(dsp->record_buffer));
 }
 
+void
+sb_start_dma_ess(sb_dsp_t* dsp, int dma8, int autoinit, uint8_t format, int len)
+{
+    if (IS_ESS(dsp)) {
+        dma_set_drq(dsp->sb_8_dmanum, 0);
+        dma_set_drq(dsp->sb_16_8_dmanum, 0);
+    }
+    sb_start_dma(dsp, dma8, autoinit, format, len);
+    dsp->ess_playback_mode = 1;
+    dma_set_drq(dsp->sb_8_dmanum, 1);
+    dma_set_drq(dsp->sb_16_8_dmanum, 1);
+}
+
+void
+sb_start_dma_ess_i(sb_dsp_t* dsp, int dma8, int autoinit, uint8_t format, int len)
+{
+    if (IS_ESS(dsp)) {
+        dma_set_drq(dsp->sb_8_dmanum, 0);
+        dma_set_drq(dsp->sb_16_8_dmanum, 0);
+    }
+    sb_start_dma_i(dsp, dma8, autoinit, format, len);
+    dsp->ess_playback_mode = 1;
+    dma_set_drq(dsp->sb_8_dmanum, 1);
+    dma_set_drq(dsp->sb_16_8_dmanum, 1);
+}
+
 int
 sb_8_read_dma(void *priv)
 {