Fixed PS3 controller not working.

Switch-Bros · Dec 25, 2024 · 0b4783d · 0b4783d
1 parent 87fc23b
commit 0b4783d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/source/ControllerLib/Controllers/Dualshock3Controller.h b/source/ControllerLib/Controllers/Dualshock3Controller.h
@@ -92,7 +92,7 @@ struct Dualshock3ButtonData
     uint16_t accelerometer_y;
     uint16_t accelerometer_z;
     uint16_t gyroscope;
-};
+} _PACKED;
 
 enum Dualshock3LEDValue : uint8_t
 {

diff --git a/source/ControllerLib/Controllers/Xbox360Controller.h b/source/ControllerLib/Controllers/Xbox360Controller.h
@@ -37,7 +37,7 @@ struct Xbox360ButtonData
     int16_t Y;
     int16_t Z;
     int16_t Rz;
-};
+} _PACKED;
 
 enum Xbox360InputPacketType : uint8_t
 {

diff --git a/source/ControllerLib/Controllers/XboxController.h b/source/ControllerLib/Controllers/XboxController.h
@@ -38,7 +38,7 @@ struct XboxButtonData
     int16_t stick_left_y;
     int16_t stick_right_x;
     int16_t stick_right_y;
-};
+} _PACKED;
 
 struct XboxRumbleData
 {
@@ -48,7 +48,7 @@ struct XboxRumbleData
     uint8_t big;
     uint8_t dummy2;
     uint8_t little;
-};
+} _PACKED;
 
 class XboxController : public BaseController
 {

diff --git a/source/ControllerLib/Controllers/XboxOneController.h b/source/ControllerLib/Controllers/XboxOneController.h
@@ -39,7 +39,7 @@ struct XboxOneButtonData
     int16_t stick_left_y;
     int16_t stick_right_x;
     int16_t stick_right_y;
-};
+} _PACKED;
 
 class XboxOneController : public BaseController
 {

diff --git a/source/ControllerLib/IUSBDevice.h b/source/ControllerLib/IUSBDevice.h
@@ -4,6 +4,14 @@
 #include <cstdio>
 #include <vector>
 
+#ifndef _PACKED
+    #if WIN32
+        #define _PACKED
+    #else
+        #define _PACKED __attribute__((packed))
+    #endif
+#endif
+
 class IUSBDevice
 {
 protected: