ps2homebrew · israpps · Dec 9, 2022 · Jan 9, 2023 · Mar 7, 2023 · Apr 4, 2023
diff --git a/.github/workflows/Clang-PR.yml b/.github/workflows/Clang-PR.yml
@@ -0,0 +1,30 @@
+name: CI-format-pull-request
+
+# only perform this workflow if a developer manually triggers it from the actions tab
+on:
+  workflow_dispatch:
+
+jobs:
+  check-format:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: DoozyX/[email protected]
+      with:
+        source: '.'
+        extensions: 'h,c'
+        clangFormatVersion: 12
+        inplace: true
+
+    - name: Create Pull Request
+      id: prmaker
+      uses: peter-evans/create-pull-request@v4
+      with:
+        commit-message: "Format source code"
+        body: "clang-format"
+        title: "clang-format"
+        delete-branch: true
+        branch-suffix: random
+        add-paths: |
+          *
diff --git a/Makefile b/Makefile
@@ -146,7 +146,8 @@ else
 endif
 
 ifeq ($(PADEMU),1)
-  IOP_OBJS += bt_pademu.o usb_pademu.o ds34usb.o ds34bt.o libds34usb.a libds34bt.a
+  IOP_OBJS += pademu.o btstack.o ds3usb.o ds4usb.o xbox360usb.o xboxoneusb.o \
+		ds3bt.o ds4bt.o hidusb.o ds34usb.o ds34bt.o libds34usb.a libds34bt.a
   EE_CFLAGS += -DPADEMU
   EE_INCS += -Imodules/ds34bt/ee -Imodules/ds34usb/ee
   PADEMU_FLAGS = PADEMU=1
@@ -297,8 +298,15 @@ clean:	download_lwNBD
 	echo " -ds34bt"
 	$(MAKE) -C modules/ds34bt clean
 	echo " -pademu"
-	$(MAKE) -C modules/pademu USE_BT=1 clean
-	$(MAKE) -C modules/pademu USE_USB=1 clean
+	$(MAKE) -C modules/pademu clean
+	$(MAKE) -C modules/pademu/btstack clean
+	$(MAKE) -C modules/pademu/ds3usb clean
+	$(MAKE) -C modules/pademu/ds4usb clean
+	$(MAKE) -C modules/pademu/xbox360usb clean
+	$(MAKE) -C modules/pademu/xboxoneusb clean
+	$(MAKE) -C modules/pademu/ds3bt clean
+	$(MAKE) -C modules/pademu/ds4bt clean
+	$(MAKE) -C modules/pademu/hidusb clean
 	echo "-pc tools"
 	$(MAKE) -C pc clean
 
@@ -490,17 +498,59 @@ modules/ds34usb/iop/ds34usb.irx: modules/ds34usb/iop
 $(EE_ASM_DIR)ds34usb.s: modules/ds34usb/iop/ds34usb.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ ds34usb_irx
 
-modules/pademu/bt_pademu.irx: modules/pademu
-	$(MAKE) -C $< USE_BT=1
+modules/pademu/pademu.irx: modules/pademu
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)pademu.s: modules/pademu/pademu.irx
+	$(BIN2S) $< $@ pademu_irx
+
+modules/pademu/btstack/btstack.irx: modules/pademu/btstack
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)btstack.s: modules/pademu/btstack/btstack.irx
+	$(BIN2S) $< $@ btstack_irx
+
+modules/pademu/ds3usb/ds3usb.irx: modules/pademu/ds3usb
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)ds3usb.s: modules/pademu/ds3usb/ds3usb.irx
+	$(BIN2S) $< $@ ds3usb_irx
+
+modules/pademu/ds4usb/ds4usb.irx: modules/pademu/ds4usb
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)ds4usb.s: modules/pademu/ds4usb/ds4usb.irx
+	$(BIN2S) $< $@ ds4usb_irx
 
-$(EE_ASM_DIR)bt_pademu.s: modules/pademu/bt_pademu.irx
-	$(BIN2S) $< $@ bt_pademu_irx
+modules/pademu/xbox360usb/xbox360usb.irx: modules/pademu/xbox360usb
+	$(MAKE) -C $<
 
-modules/pademu/usb_pademu.irx: modules/pademu
-	$(MAKE) -C $< USE_USB=1
+$(EE_ASM_DIR)xbox360usb.s: modules/pademu/xbox360usb/xbox360usb.irx
+	$(BIN2S) $< $@ xbox360usb_irx
+
+modules/pademu/xboxoneusb/xboxoneusb.irx: modules/pademu/xboxoneusb
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)xboxoneusb.s: modules/pademu/xboxoneusb/xboxoneusb.irx
+	$(BIN2S) $< $@ xboxoneusb_irx
+
+modules/pademu/ds3bt/ds3bt.irx: modules/pademu/ds3bt
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)ds3bt.s: modules/pademu/ds3bt/ds3bt.irx
+	$(BIN2S) $< $@ ds3bt_irx
+
+modules/pademu/ds4bt/ds4bt.irx: modules/pademu/ds4bt
+	$(MAKE) -C $<
+
+$(EE_ASM_DIR)ds4bt.s: modules/pademu/ds4bt/ds4bt.irx
+	$(BIN2S) $< $@ ds4bt_irx
+
+modules/pademu/hidusb/hidusb.irx: modules/pademu/hidusb
+	$(MAKE) -C $<
 
-$(EE_ASM_DIR)usb_pademu.s: modules/pademu/usb_pademu.irx
-	$(BIN2S) $< $@ usb_pademu_irx
+$(EE_ASM_DIR)hidusb.s: modules/pademu/hidusb/hidusb.irx
+	$(BIN2S) $< $@ hidusb_irx
 
 $(EE_ASM_DIR)bdm.s: $(PS2SDK)/iop/irx/bdm.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ bdm_irx

diff --git a/ee_core/include/ee_core.h b/ee_core/include/ee_core.h
@@ -87,6 +87,7 @@ extern int EnableCheatOp;
 extern int EnablePadEmuOp;
 extern int PadEmuSettings;
 extern int PadMacroSettings;
+extern int PadEmuModules;
 #endif
 
 extern int EnableDebug;

diff --git a/ee_core/include/modules.h b/ee_core/include/modules.h
@@ -25,6 +25,14 @@ enum OPL_MODULE_ID {
     OPL_MODULE_ID_MCEMU,
 
     OPL_MODULE_ID_PADEMU,
+    OPL_MODULE_ID_BTSTACK,
+    OPL_MODULE_ID_DS3USB,
+    OPL_MODULE_ID_DS4USB,
+    OPL_MODULE_ID_XBOX360USB,
+    OPL_MODULE_ID_XBOXONEUSB,
+    OPL_MODULE_ID_DS3BT,
+    OPL_MODULE_ID_DS4BT,
+    OPL_MODULE_ID_HIDUSB,
 
     // Debugging modules
     OPL_MODULE_ID_UDPTTY,

diff --git a/ee_core/src/iopmgr.c b/ee_core/src/iopmgr.c
@@ -7,6 +7,13 @@
   Some parts of the code are taken from HD Project by Polo
 */
 
+#define PADEMU_MODULES_ID_DS3USB (1 << 0)
+#define PADEMU_MODULES_ID_DS3BT (1 << 1)
+#define PADEMU_MODULES_ID_DS4USB (1 << 2)
+#define PADEMU_MODULES_ID_DS4BT (1 << 3)
+#define PADEMU_MODULES_ID_XBOX360USB (1 << 4)
+#define PADEMU_MODULES_ID_XBOXONEUSB (1 << 5)
+#define PADEMU_MODULES_ID_HIDUSB (1 << 6)
 #include <iopcontrol.h>
 
 #include "ee_core.h"
@@ -184,14 +191,43 @@ int New_Reset_Iop(const char *arg, int arglen)
     }
 
 #ifdef PADEMU
+    int btstack_loaded = 0;
     if (iop_reboot_count >= 2 && EnablePadEmuOp) {
         char args_for_pademu[8];
         memcpy(args_for_pademu, &PadEmuSettings, 4);
         memcpy(args_for_pademu + 4, &PadMacroSettings, 4);
         LoadOPLModule(OPL_MODULE_ID_PADEMU, 0, sizeof(args_for_pademu), args_for_pademu);
+        if (PadEmuModules & PADEMU_MODULES_ID_DS3USB) {
+            LoadOPLModule(OPL_MODULE_ID_DS3USB, 0, 0, NULL);
+        }
+        if (PadEmuModules & PADEMU_MODULES_ID_DS3BT) {
+            if (!btstack_loaded) {
+                LoadOPLModule(OPL_MODULE_ID_BTSTACK, 0, 0, NULL);
+                btstack_loaded = 1;
+            }
+            LoadOPLModule(OPL_MODULE_ID_DS3BT, 0, 0, NULL);
+        }
+        if (PadEmuModules & PADEMU_MODULES_ID_DS4USB) {
+            LoadOPLModule(OPL_MODULE_ID_DS4USB, 0, 0, NULL);
+        }
+        if (PadEmuModules & PADEMU_MODULES_ID_DS4BT) {
+            if (!btstack_loaded) {
+                LoadOPLModule(OPL_MODULE_ID_BTSTACK, 0, 0, NULL);
+                btstack_loaded = 1;
+            }
+            LoadOPLModule(OPL_MODULE_ID_DS4BT, 0, 0, NULL);
+        }
+        if (PadEmuModules & PADEMU_MODULES_ID_XBOX360USB) {
+            LoadOPLModule(OPL_MODULE_ID_XBOX360USB, 0, 0, NULL);
+        }
+        if (PadEmuModules & PADEMU_MODULES_ID_XBOXONEUSB) {
+            LoadOPLModule(OPL_MODULE_ID_XBOXONEUSB, 0, 0, NULL);
+        }
+        if (PadEmuModules & PADEMU_MODULES_ID_HIDUSB) {
+            LoadOPLModule(OPL_MODULE_ID_HIDUSB, 0, 0, NULL);
+        }
     }
 #endif
-
     DPRINTF("Exiting services...\n");
     SifExitIopHeap();
     LoadFileExit();

diff --git a/ee_core/src/main.c b/ee_core/src/main.c
@@ -37,6 +37,7 @@ int EnableCheatOp;
 int EnablePadEmuOp;
 int PadEmuSettings;
 int PadMacroSettings;
+int PadEmuModules;
 #endif
 int EnableDebug;
 int *gCheatList; // Store hooks/codes addr+val pairs
@@ -108,8 +109,8 @@ static int eecoreInit(int argc, char **argv)
     DPRINTF("PADEMU = %s\n", EnablePadEmuOp == 0 ? "Disabled" : "Enabled");
 
     PadEmuSettings = _strtoi(_strtok(NULL, " "));
-
     PadMacroSettings = _strtoi(_strtok(NULL, " "));
+    PadEmuModules = _strtoi(_strtok(NULL, " "));
 #endif
     CustomOSDConfigParam.spdifMode = _strtoi(_strtok(NULL, " "));
     CustomOSDConfigParam.screenType = _strtoi(_strtok(NULL, " "));

diff --git a/include/config.h b/include/config.h
@@ -58,6 +58,7 @@ enum CONFIG_INDEX {
 #define CONFIG_ITEM_PADEMUSOURCE     "$PADEMUSource"
 #define CONFIG_ITEM_ENABLEPADEMU     "$EnablePadEmu"
 #define CONFIG_ITEM_PADEMUSETTINGS   "$PadEmuSettings"
+#define CONFIG_ITEM_PADEMUMODULES    "$PadEmuModules"
 #define CONFIG_ITEM_PADMACROSETTINGS "$PadMacroSettings"
 #define CONFIG_ITEM_PADMACROSOURCE   "$PadMacroSource"
 

diff --git a/include/dialogs.h b/include/dialogs.h
@@ -147,7 +147,7 @@ enum UI_ITEMS {
     PADCFG_PADEMU_SOURCE,
     PADCFG_PADEMU_CONFIG,
     PADCFG_PADEMU_ENABLE,
-    PADCFG_PADEMU_MODE,
+    PADCFG_PADEMU_MODULES_LIST,
     PADCFG_PADEMU_PORT,
     PADCFG_PADEMU_VIB,
     PADCFG_PADPORT,
@@ -171,6 +171,7 @@ enum UI_ITEMS {
     PADCFG_PADEMU_MTAP_PORT,
     PADCFG_PADEMU_WORKAROUND,
     PADCFG_PADEMU_WORKAROUND_STR,
+    PADCFG_PADEMU_MODULES_SET,
 
     PADMACRO_GLOBAL_BUTTON,
     PADMACRO_CFG_SOURCE,
@@ -184,7 +185,7 @@ enum UI_ITEMS {
     PADMACRO_INVERT_RY,
     PADMACRO_TURBO_SPEED,
 
-    COMPAT_MODE_BASE = 250,
+    COMPAT_MODE_BASE = 251,
 #else
     COMPAT_MODE_BASE = 200,
 #endif

diff --git a/include/extern_irx.h b/include/extern_irx.h
@@ -12,6 +12,8 @@ IMPORT_BIN2C(audsrv_irx);
 
 IMPORT_BIN2C(bdm_irx);
 
+IMPORT_BIN2C(btstack_irx);
+
 IMPORT_BIN2C(bdm_cdvdman_irx);
 
 IMPORT_BIN2C(bdm_mcemu_irx);
@@ -28,6 +30,14 @@ IMPORT_BIN2C(cleareffects_irx);
 
 IMPORT_BIN2C(deci2_img);
 
+IMPORT_BIN2C(ds3bt_irx);
+
+IMPORT_BIN2C(ds3usb_irx);
+
+IMPORT_BIN2C(ds4bt_irx);
+
+IMPORT_BIN2C(ds4usb_irx);
+
 IMPORT_BIN2C(drvtif_irx);
 
 IMPORT_BIN2C(drvtif_ingame_irx);
@@ -42,6 +52,8 @@ IMPORT_BIN2C(genvmc_irx);
 
 IMPORT_BIN2C(hdd_cdvdman_irx);
 
+IMPORT_BIN2C(hidusb_irx);
+
 IMPORT_BIN2C(hdd_hdpro_cdvdman_irx);
 
 IMPORT_BIN2C(lwnbdsvr_irx);
@@ -68,6 +80,10 @@ IMPORT_BIN2C(isofs_irx);
 
 IMPORT_BIN2C(iremsndpatch_irx);
 
+IMPORT_BIN2C(pademu_irx);
+
+IMPORT_BIN2C(padman_irx);
+
 IMPORT_BIN2C(libsd_irx);
 
 IMPORT_BIN2C(mcman_irx);
@@ -126,6 +142,10 @@ IMPORT_BIN2C(udptty_irx);
 
 IMPORT_BIN2C(udptty_ingame_irx);
 
+IMPORT_BIN2C(xbox360usb_irx);
+
+IMPORT_BIN2C(xboxoneusb_irx);
+
 IMPORT_BIN2C(udnl_irx);
 
 IMPORT_BIN2C(usbd_irx);

diff --git a/include/opl.h b/include/opl.h
@@ -165,6 +165,7 @@ extern int showCfgPopup;
 #ifdef PADEMU
 extern int gEnablePadEmu;
 extern int gPadEmuSettings;
+extern int gPadEmuModules;
 extern int gPadMacroSource;
 extern int gPadMacroSettings;
 #endif

diff --git a/include/ds34common.h → include/pademu_common.h b/include/ds34common.h → include/pademu_common.h
@@ -1,5 +1,5 @@
-#ifndef _DS34COMMON_H_
-#define _DS34COMMON_H_
+#ifndef _PADEMU_COMMON_
+#define _PADEMU_COMMON_
 #include <stdint.h>
 
 #define USB_CLASS_WIRELESS_CONTROLLER 0xE0

diff --git a/lng_tmpl/_base.yml b/lng_tmpl/_base.yml
@@ -670,3 +670,9 @@ gui_strings:
   string: Default Theme Music
 - label: DEF_BGM_PATH_HINT
   string: Set path to stream music for internal theme.
+- label: PADEMU_MODULES
+  string: Select modules to load
+- label: HINT_PADEMU_MODULES
+  string: Select which pademu modules to load.
+- label: HINT_PADEMU_MODULES_SET
+  string: Select/Unselect pademu module.
diff --git a/modules/Rules.bin.make b/modules/Rules.bin.make
@@ -12,3 +12,8 @@ rebuild: clean all
 
 run:
 	ps2client -t 1 execiop host:$(IOP_BIN)
+
+ifdef DEBUG
+$(info debug enabled)
+IOP_CFLAGS += -DDEBUG=$(DEBUG)
+endif
diff --git a/modules/ds34bt/iop/ds34bt.h b/modules/ds34bt/iop/ds34bt.h
@@ -3,7 +3,7 @@
 
 #include "irx.h"
 
-#include <ds34common.h>
+#include <pademu_common.h>
 
 #define DS3 0
 #define DS4 1

diff --git a/modules/ds34usb/iop/ds34usb.h b/modules/ds34usb/iop/ds34usb.h
@@ -3,7 +3,7 @@
 
 #include "irx.h"
 
-#include <ds34common.h>
+#include <pademu_common.h>
 
 #define DS3 0
 #define DS4 1

diff --git a/modules/pademu/Makefile b/modules/pademu/Makefile
@@ -1,18 +1,7 @@
-IOP_OBJS = pademu.o sys_utils.o imports.o exports.o padmacro.o ds34common.o
 
-ifeq ($(USE_USB),1)
-IOP_BIN = usb_pademu.irx
-IOP_CFLAGS += -DUSB
-IOP_OBJS_DIR = obj.usb/
-IOP_OBJS += ds34usb.o
-endif
-
-ifeq ($(USE_BT),1)
-IOP_BIN = bt_pademu.irx
-IOP_CFLAGS += -DBT
-IOP_OBJS_DIR = obj.bt/
-IOP_OBJS += ds34bt.o
-endif
+IOP_BIN = pademu.irx
+IOP_OBJS = pademu.o sys_utils.o padmacro.o imports.o exports.o
+IOP_OBJS_DIR = obj.pademu/
 
 ifeq ($(VMC),1)
 IOP_CFLAGS += -DVMC