Attempt to fix pademu access.

ps2homebrew · Nov 10, 2024 · 0c824da · 0c824da
1 parent 2d7e694
commit 0c824da
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/ee_core/include/modules.h b/ee_core/include/modules.h
@@ -26,6 +26,10 @@ enum OPL_MODULE_ID {
 
     OPL_MODULE_ID_PADEMU,
 
+    // DS4/DS3 modules
+    OPL_MODULE_ID_DS34BT,
+    OPL_MODULE_ID_DS34USB,
+
     // Debugging modules
     OPL_MODULE_ID_UDPTTY,
     OPL_MODULE_ID_IOPTRAP,

diff --git a/ee_core/src/iopmgr.c b/ee_core/src/iopmgr.c
@@ -197,6 +197,11 @@ int New_Reset_Iop(const char *arg, int arglen)
         memcpy(args_for_pademu, &config->PadEmuSettings, 4);
         memcpy(args_for_pademu + 4, &config->PadMacroSettings, 4);
         LoadOPLModule(OPL_MODULE_ID_PADEMU, 0, sizeof(args_for_pademu), args_for_pademu);
+        if (config->PadEmuSettings & 0xFF) {
+            LoadOPLModule(OPL_MODULE_ID_DS34BT, 0, sizeof(args_for_pademu), args_for_pademu);
+        } else {
+            LoadOPLModule(OPL_MODULE_ID_DS34USB, 0, sizeof(args_for_pademu), args_for_pademu);
+        }
     }
 #endif
 

diff --git a/src/system.c b/src/system.c
@@ -540,6 +540,13 @@ static unsigned int sendIrxKernelRAM(const char *startup, const char *mode_str,
     if (gEnablePadEmu) {
         irxptr_tab[modcount].info = size_pademu_irx | SET_OPL_MOD_ID(OPL_MODULE_ID_PADEMU);
         irxptr_tab[modcount++].ptr = (void *)&pademu_irx;
+        if (gPadEmuSettings & 0xFF) {
+            irxptr_tab[modcount].info = size_ds34bt_irx | SET_OPL_MOD_ID(OPL_MODULE_ID_DS34BT);
+            irxptr_tab[modcount++].ptr = (void *)&size_ds34bt_irx;
+        } else {
+            irxptr_tab[modcount].info = size_ds34usb_irx | SET_OPL_MOD_ID(OPL_MODULE_ID_DS34USB);
+            irxptr_tab[modcount++].ptr = (void *)&ds34usb_irx;
+        }
     }
 #endif