Remove unused parameter(Rick Gaiser).

Fix makefile typo. Co-authored-by: Rick Gaiser <rgaiser@gmail.com>
ps2homebrew · Dec 3, 2024 · de8efec · de8efec
1 parent 0431fc1
commit de8efec
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/modules/pademu/Makefile b/modules/pademu/Makefile
@@ -2,12 +2,12 @@ IOP_OBJS = pademu_common.o pademu.o sys_utils.o imports.o exports.o padmacro.o
 
 IOP_BIN = pademu.irx
 
-ifeq ($(USE_DS3USB),1)
+ifeq ($(USE_DS3),1)
 IOP_CFLAGS += -DUSE_DS3
 IOP_OBJS += ds3usb.o ds3bt.o
 endif
 
-ifeq ($(USE_DS4USB),1)
+ifeq ($(USE_DS4),1)
 IOP_CFLAGS += -DUSE_DS4
 IOP_OBJS += ds4usb.o ds4bt.o
 endif

diff --git a/modules/pademu/ds3bt.c b/modules/pademu/ds3bt.c
@@ -44,7 +44,7 @@ static UsbDriver chrg_driver = {NULL, NULL, "ds3chrg", chrg_probe, chrg_connect,
 static void ds3pad_clear(int pad);
 static void ds3pad_init();
 static int ds3bt_get_status(struct pad_funcs *pf);
-static int ds3bt_get_model(struct pad_funcs *pf, int port);
+static int ds3bt_get_model(struct pad_funcs *pf);
 static int ds3bt_get_data(struct pad_funcs *pf, u8 *dst, int size, int port);
 static void ds3bt_set_rumble(struct pad_funcs *pf, u8 lrum, u8 rrum);
 static void ds3bt_set_mode(struct pad_funcs *pf, int mode, int lock);
@@ -1263,9 +1263,8 @@ static int ds3bt_get_status(struct pad_funcs *pf)
     return ret;
 }
 
-static int ds3bt_get_model(struct pad_funcs *pf, int port)
+static int ds3bt_get_model(struct pad_funcs *pf)
 {
-    (void)port;
     (void)pf;
     return 3;
 }

diff --git a/modules/pademu/ds3usb.c b/modules/pademu/ds3usb.c
@@ -1,3 +1,6 @@
+/* based on https://github.com/IonAgorria/Arduino-PSRemote */
+/* and https://github.com/felis/USB_Host_Shield_2.0 */
+
 #include "types.h"
 #include "loadcore.h"
 #include "stdio.h"
@@ -69,7 +72,7 @@ static void DS3USB_init(int pad);
 static void readReport(u8 *data, int pad);
 static int LEDRumble(u8 *led, u8 lrum, u8 rrum, int pad);
 
-static int ds3usb_get_model(struct pad_funcs *pf, int port);
+static int ds3usb_get_model(struct pad_funcs *pf);
 static int ds3usb_get_data(struct pad_funcs *pf, u8 *dst, int size, int port);
 static void ds3usb_set_rumble(struct pad_funcs *pf, u8 lrum, u8 rrum);
 static void ds3usb_set_mode(struct pad_funcs *pf, int mode, int lock);
@@ -467,9 +470,8 @@ static int ds3usb_get_status(struct pad_funcs *pf)
     return ret;
 }
 
-static int ds3usb_get_model(struct pad_funcs *pf, int port)
+static int ds3usb_get_model(struct pad_funcs *pf)
 {
-    (void)port;
     ds3usb_device *pad = pf->priv;
     int ret;
 

diff --git a/modules/pademu/ds4bt.c b/modules/pademu/ds4bt.c
@@ -43,7 +43,7 @@ static UsbDriver chrg_driver = {NULL, NULL, "ds4chrg", chrg_probe, chrg_connect,
 static void ds4pad_clear(int pad);
 static void ds4pad_init();
 static int ds4bt_get_status(struct pad_funcs *pf);
-static int ds4bt_get_model(struct pad_funcs *pf, int port);
+static int ds4bt_get_model(struct pad_funcs *pf);
 static int ds4bt_get_data(struct pad_funcs *pf, u8 *dst, int size, int port);
 static void ds4bt_set_rumble(struct pad_funcs *pf, u8 lrum, u8 rrum);
 static void ds4bt_set_mode(struct pad_funcs *pf, int mode, int lock);
@@ -1239,9 +1239,8 @@ static int ds4bt_get_status(struct pad_funcs *pf)
     return ret;
 }
 
-static int ds4bt_get_model(struct pad_funcs *pf, int port)
+static int ds4bt_get_model(struct pad_funcs *pf)
 {
-    (void)port;
     (void)pf;
     return 3;
 }

diff --git a/modules/pademu/ds4usb.c b/modules/pademu/ds4usb.c
@@ -1,3 +1,6 @@
+/* based on https://github.com/IonAgorria/Arduino-PSRemote */
+/* and https://github.com/felis/USB_Host_Shield_2.0 */
+
 #include "types.h"
 #include "loadcore.h"
 #include "stdio.h"
@@ -49,7 +52,7 @@ static UsbDriver usb_driver = {NULL, NULL, "ds4usb", usb_probe, usb_connect, usb
 static void readReport(u8 *data, int pad);
 static int LEDRumble(u8 *led, u8 lrum, u8 rrum, int pad);
 
-static int ds4usb_get_model(struct pad_funcs *pf, int port);
+static int ds4usb_get_model(struct pad_funcs *pf);
 static int ds4usb_get_data(struct pad_funcs *pf, u8 *dst, int size, int port);
 static void ds4usb_set_rumble(struct pad_funcs *pf, u8 lrum, u8 rrum);
 static void ds4usb_set_mode(struct pad_funcs *pf, int mode, int lock);
@@ -422,9 +425,8 @@ static int ds4usb_get_status(struct pad_funcs *pf)
     return ret;
 }
 
-static int ds4usb_get_model(struct pad_funcs *pf, int port)
+static int ds4usb_get_model(struct pad_funcs *pf)
 {
-    (void)port;
     ds4usb_device *pad = pf->priv;
     int ret;
 

diff --git a/modules/pademu/pademu.c b/modules/pademu/pademu.c
@@ -516,7 +516,7 @@ static void pademu_cmd(int port, u8 *in, u8 *out, u8 out_size)
         case 0x45: // query model and mode
             mips_memcpy(&out[3], &pademu_data[1], 6);
             out[5] = pad[port].mode;
-            out[3] = padf[port]->get_model(padf[port], port);
+            out[3] = padf[port]->get_model(padf[port]);
             break;
 
         case 0x46: // query act

diff --git a/modules/pademu/pademu.h b/modules/pademu/pademu.h
@@ -66,7 +66,7 @@ struct pad_funcs
     int (*get_data)(struct pad_funcs *pf, u8 *dst, int size, int port);
     void (*set_rumble)(struct pad_funcs *pf, u8 lrum, u8 rrum);
     void (*set_mode)(struct pad_funcs *pf, int mode, int lock);
-    int (*get_model)(struct pad_funcs *pf, int port);
+    int (*get_model)(struct pad_funcs *pf);
 };
 void pademu_connect(struct pad_funcs *pf);
 void pademu_disconnect(struct pad_funcs *pf);