From 0ca2cb3551a3060a6699fb9c7e087d0946a52ffd Mon Sep 17 00:00:00 2001
From: Cuyler36 <Cuyler36@users.noreply.github.com>
Date: Sat, 21 Jun 2025 05:59:45 -0400
Subject: [PATCH] jaudio_NES: match & link driverinterface

---
 configure.py                                  |  2 +-
 include/jaudio_NES/audiostruct.h              |  2 +-
 .../jaudio_NES/internal/driverinterface.c     | 71 ++++++++++---------
 3 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/configure.py b/configure.py
index 619766fe..373fba36 100644
--- a/configure.py
+++ b/configure.py
@@ -767,7 +767,7 @@ config.libs = [
             Object(NonMatching, "jaudio_NES/internal/cmdstack.c"),
             Object(NonMatching, "jaudio_NES/internal/connect.c"),
             Object(NonMatching, "jaudio_NES/internal/driver.c"),
-            Object(NonMatching, "jaudio_NES/internal/driverinterface.c"),
+            Object(Matching, "jaudio_NES/internal/driverinterface.c"),
             Object(Matching, "jaudio_NES/internal/dsp_cardunlock.c"),
             Object(Matching, "jaudio_NES/internal/dsp_GBAKey.c"),
             Object(NonMatching, "jaudio_NES/internal/dspdriver.c"),
diff --git a/include/jaudio_NES/audiostruct.h b/include/jaudio_NES/audiostruct.h
index ae17aac1..58910796 100644
--- a/include/jaudio_NES/audiostruct.h
+++ b/include/jaudio_NES/audiostruct.h
@@ -1055,7 +1055,7 @@ struct jc_ {
 	u8 pauseFlag;                       // _02
 	u8 toFlush;                         // _03
 	jcs_* mMgr;                         // _04
-	void** chanListHead;                // _08
+	struct jc_** chanListHead;                // _08
 	u8 logicalChanType;                 // _0C, 0 = Wave, 1 = ??, 2 = Oscillator
 	Wave_* waveData;                    // _10
 	u32 _14;                            // _14
diff --git a/src/static/jaudio_NES/internal/driverinterface.c b/src/static/jaudio_NES/internal/driverinterface.c
index d33ecb08..a4f1c1ef 100644
--- a/src/static/jaudio_NES/internal/driverinterface.c
+++ b/src/static/jaudio_NES/internal/driverinterface.c
@@ -106,31 +106,33 @@ void List_GlobalChannel()
  */
 int List_CutChannel(jc_* jc)
 {
-	jc_* chan = (jc_*)*jc->chanListHead;
-	int num   = 0;
+    jc_* orig = jc;
+	jc_* chan = *jc->chanListHead;
+    int num   = 0;
+    int ret;
 
 	if (chan == jc) {
-		*jc->chanListHead = jc->mNext;
+		*jc->chanListHead = (jc_*)jc->mNext;
 		jc->chanListHead  = NULL;
-		return 0;
+        return 0;
 	}
+    
+    while (TRUE) {
+        num++;
+        if (chan == NULL) {
+            return -1;
+        }
 
-	while (TRUE) {
-		num++;
-		if (chan == NULL) {
-			return -1;
-		}
+        jc = (jc_*)chan->mNext;
+        if (jc == orig) {
+            break;
+        }
 
-		if (chan->mNext == jc) {
-			break;
-		}
-
-		chan = (jc_*)chan->mNext;
-	}
-
-	chan->mNext      = jc->mNext;
-	jc->chanListHead = NULL;
+        chan = (jc_*)chan->mNext;
+    }
 
+    chan->mNext      = orig->mNext;
+    orig->chanListHead = NULL;
 	return num;
 }
 
@@ -160,7 +162,7 @@ jc_* List_GetChannel(jc_** jc)
 void List_AddChannelTail(jc_** jc, jc_* in)
 {
 	jc_* chan        = *jc;
-	in->chanListHead = (void**)jc;
+	in->chanListHead = jc;
 
 	if (chan == NULL) {
 		*jc       = in;
@@ -188,7 +190,7 @@ void List_AddChannelTail(jc_** jc, jc_* in)
 void List_AddChannel(jc_** jc, jc_* in)
 {
 	jc_* chan        = *jc;
-	in->chanListHead = (void**)jc;
+	in->chanListHead = jc;
 	*jc              = in;
 	in->mNext        = chan;
 }
@@ -756,9 +758,9 @@ static void KillBrokenLogicalChannels(dspch_* ch)
  */
 static int CommonCallbackLogicalChannel(dspch_* ch, u32 a)
 {
-	u32 b   = 0;
-	jc_* jc = ch->_08;
+    jc_* jc = ch->_08;
 	u32 i;
+	u32 b   = 0;
 	dspch_** REF_ch = &ch;
 	jc_** REF_jc    = &jc;
 	if (jc == NULL) {
@@ -942,16 +944,16 @@ BOOL PlayLogicalChannel(jc_* jc)
 
 	for (u32 i = 0; i < 6; i++) {
 		MixConfig bus = jc->busRouting[i];
-		if (JAC_SYSTEM_OUTPUT_MODE == 0) {
-			switch (bus.parts.upper) {
-			case 8:
-				bus.parts.upper = 11;
-				break;
-			case 9:
-				bus.parts.upper = 2;
-				break;
-			}
-		}
+		// if (JAC_SYSTEM_OUTPUT_MODE == 0) {
+		// 	switch (bus.parts.upper) {
+		// 	case 8:
+		// 		bus.parts.upper = 11;
+		// 		break;
+		// 	case 9:
+		// 		bus.parts.upper = 2;
+		// 		break;
+		// 	}
+		// }
 		DSP_SetBusConnect(jc->dspChannel->buffer_idx, i, bus.parts.upper);
 	}
 
@@ -1020,9 +1022,8 @@ BOOL Add_WaitDSPChannel(jc_* jc)
 BOOL Del_WaitDSPChannel(jc_* jc)
 {
 	for (u32 i = 0; i < cur_waits; i++) {
-		u32 a = (cur_top + i) & 0x1F;
-		if (waitp[a] == jc) {
-			waitp[a] = NULL;
+		if (waitp[(cur_top + i) & 0x1F] == jc) {
+			waitp[(cur_top + i) & 0x1F] = NULL;
 			return TRUE;
 		}
 	}