From 161794f0fc2dc29219ff01360b12eed71336521e Mon Sep 17 00:00:00 2001 From: PA Dev Bot <344001113+pa-devbot@users.noreply.github.com> Date: Tue, 10 Nov 2026 18:46:02 +0000 Subject: [PATCH 1/2] Use #pragma pack instead of PABB_PACK in the shared protocol headers #pragma pack(push, 1) / #pragma pack(pop) is supported by MSVC, GCC/Clang and avr-gcc alike, so the #if _WIN32 / #elif __GNUC__ PABB_PACK macro (#define PABB_PACK __attribute__((packed)) on GCC, empty on MSVC) is replaced by a single pack(1) region around the message structs, and the PABB_PACK tokens are dropped from the struct declarations. --- .../PABotBase2_Controller_HID_Keyboard.h | 11 +-- .../PABotBase2_Controller_NS1_OemController.h | 17 +--- ...PABotBase2_Controller_NS_WiredController.h | 11 +-- .../PABotBase2/PABotBase2_MessageProtocol.h | 13 +-- .../PABotBase2_PacketProtocol.h | 15 +--- .../SerialPABotBase_Messages_HID_Keyboard.h | 11 +-- ...ialPABotBase_Messages_NS1_OemControllers.h | 21 ++--- ...ialPABotBase_Messages_NS_WiredController.h | 11 +-- .../SerialPABotBase_Protocol.h | 79 ++++++++----------- ...intendoSwitch_PABotBase2_OemController.cpp | 9 --- 10 files changed, 54 insertions(+), 144 deletions(-) diff --git a/Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h b/Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h index e3d396e77f..58aef26d3d 100644 --- a/Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h +++ b/Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h @@ -10,14 +10,7 @@ #include "../../ControllerStates/StandardHid_Keyboard_State.h" #include "../PABotBase2_MessageProtocol.h" -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif namespace PokemonAutomation{ namespace PABotBase2{ @@ -25,7 +18,7 @@ namespace PABotBase2{ #define PABB2_MESSAGE_CMD_HID_KEYBOARD_STATE 0x82 -struct PABB_PACK pabb2_Message_Command_HID_Keyboard_State : MessageHeader{ +struct pabb2_Message_Command_HID_Keyboard_State : MessageHeader{ uint16_t milliseconds; pabb_HID_Keyboard_State report; }; @@ -38,9 +31,7 @@ struct PABB_PACK pabb2_Message_Command_HID_Keyboard_State : MessageHeader{ -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h index a9b3ed364e..41c9312774 100644 --- a/Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h +++ b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h @@ -10,14 +10,7 @@ #include "../../ControllerStates/NintendoSwitch_OemController_State.h" #include "../PABotBase2_MessageProtocol.h" -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif namespace PokemonAutomation{ namespace PABotBase2{ @@ -33,7 +26,7 @@ struct PABB_NintendoSwitch_ControllerColors{ #define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_READ_SPI 0x91 #define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_WRITE_SPI 0x92 -struct PABB_PACK Message_NS1_OemController_Spi : MessageHeader{ +struct Message_NS1_OemController_Spi : MessageHeader{ uint32_t controller_type; uint32_t address; uint8_t bytes; @@ -44,20 +37,20 @@ struct PABB_PACK Message_NS1_OemController_Spi : MessageHeader{ #define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_PLAYER_LIGHTS 0x94 #define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED 0x95 #define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_RUMBLE 0x96 -struct PABB_PACK Message_Feedback_NS1_OemController_Rumble : MessageHeader{ +struct Message_Feedback_NS1_OemController_Rumble : MessageHeader{ NintendoSwitch::OemController_RumbleState data; }; #define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_BUTTONS 0x97 -struct PABB_PACK Message_Command_NS1_OemController_Buttons : MessageHeader{ +struct Message_Command_NS1_OemController_Buttons : MessageHeader{ uint16_t milliseconds; NintendoSwitch::OemController_State0x30_Buttons buttons; }; #define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_FULL_STATE 0x98 -struct PABB_PACK Message_Command_NS1_OemController_FullState : MessageHeader{ +struct Message_Command_NS1_OemController_FullState : MessageHeader{ uint16_t milliseconds; NintendoSwitch::OemController_State0x30 state; }; @@ -69,9 +62,7 @@ struct PABB_PACK Message_Command_NS1_OemController_FullState : MessageHeader{ -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h index 67c7e5b348..d4910d8890 100644 --- a/Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h +++ b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h @@ -10,14 +10,7 @@ #include "../../ControllerStates/NintendoSwitch_WiredController_State.h" #include "../PABotBase2_MessageProtocol.h" -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif namespace PokemonAutomation{ namespace PABotBase2{ @@ -25,7 +18,7 @@ namespace PABotBase2{ #define PABB2_MESSAGE_CMD_NS_WIRED_CONTROLLER_STATE 0x90 -struct PABB_PACK pabb2_Message_Command_NS_WiredController_State : MessageHeader{ +struct pabb2_Message_Command_NS_WiredController_State : MessageHeader{ uint16_t milliseconds; pabb_NintendoSwitch_WiredController_State report; }; @@ -38,9 +31,7 @@ struct PABB_PACK pabb2_Message_Command_NS_WiredController_State : MessageHeader{ -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/PABotBase2/PABotBase2_MessageProtocol.h b/Common/PABotBase2/PABotBase2_MessageProtocol.h index 53ca6d7747..a77cbe7d44 100644 --- a/Common/PABotBase2/PABotBase2_MessageProtocol.h +++ b/Common/PABotBase2/PABotBase2_MessageProtocol.h @@ -9,14 +9,7 @@ #include -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif namespace PokemonAutomation{ namespace PABotBase2{ @@ -26,12 +19,12 @@ namespace PABotBase2{ #define PABB2_MESSAGE_PROTOCOL_VERSION 2026061804 -struct PABB_PACK MessageHeader{ +struct MessageHeader{ uint16_t message_bytes; uint8_t opcode; uint8_t id; }; -struct PABB_PACK Message_u32 : MessageHeader{ +struct Message_u32 : MessageHeader{ uint32_t data; }; @@ -74,9 +67,7 @@ struct PABB_PACK Message_u32 : MessageHeader{ } -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h index e87c9bad57..90eb9f9056 100644 --- a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h +++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h @@ -10,14 +10,7 @@ #include #include -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif namespace PokemonAutomation{ namespace PABotBase2{ @@ -47,14 +40,14 @@ namespace PABotBase2{ using SessionId = uint32_t; -struct PABB_PACK PacketHeader{ +struct PacketHeader{ uint8_t magic_number; uint8_t seqnum; uint8_t packet_bytes; uint8_t opcode; }; -struct PABB_PACK PacketHeader_u32 : PacketHeader{ +struct PacketHeader_u32 : PacketHeader{ uint32_t data; }; @@ -84,7 +77,7 @@ struct PABB_PACK PacketHeader_u32 : PacketHeader{ #define PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA 0x12 #define PABB2_CONNECTION_OPCODE_RET_STREAM_DATA 0x52 #define PABB2_CONNECTION_OPCODE_ASK_STREAM_REQUEST 0x13 // Unused for now. -struct PABB_PACK PacketHeaderData : PacketHeader{ +struct PacketHeaderData : PacketHeader{ uint16_t stream_offset; }; @@ -117,8 +110,6 @@ struct PABB_PACK PacketHeaderData : PacketHeader{ } } -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h b/Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h index 77761387a5..94dab4147a 100644 --- a/Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h +++ b/Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h @@ -10,14 +10,7 @@ #include "../ControllerStates/StandardHid_Keyboard_State.h" #include "SerialPABotBase_Protocol.h" -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif #ifdef __cplusplus @@ -30,7 +23,7 @@ typedef struct{ seqnum_t seqnum; uint16_t milliseconds; pabb_HID_Keyboard_State report; -} PABB_PACK pabb_Message_Command_HID_Keyboard_State; +} pabb_Message_Command_HID_Keyboard_State; @@ -39,8 +32,6 @@ typedef struct{ #endif -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h b/Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h index c75c6dc839..4823077d1f 100644 --- a/Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h +++ b/Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h @@ -10,14 +10,7 @@ #include "../ControllerStates/NintendoSwitch_OemController_State.h" #include "SerialPABotBase_Protocol.h" -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif #ifdef __cplusplus @@ -40,7 +33,7 @@ typedef struct{ #define PABB_MSG_INFO_NS1_OEM_CONTROLLER_RUMBLE 0x30 typedef struct{ OemController_RumbleState rumble; -} PABB_PACK pabb_MsgInfo_NS1_OemController_Rumble; +} pabb_MsgInfo_NS1_OemController_Rumble; #define PABB_MSG_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED 0x31 @@ -52,7 +45,7 @@ typedef struct{ uint32_t controller_type; uint32_t address; uint8_t bytes; -} PABB_PACK pabb_Message_NS1_OemController_ReadSpi; +} pabb_Message_NS1_OemController_ReadSpi; #define PABB_MSG_REQUEST_NS1_OEM_CONTROLLER_WRITE_SPI 0x61 typedef struct{ @@ -60,13 +53,13 @@ typedef struct{ uint32_t controller_type; uint32_t address; uint8_t bytes; -} PABB_PACK pabb_Message_NS1_OemController_WriteSpi; +} pabb_Message_NS1_OemController_WriteSpi; #define PABB_MSG_REQUEST_NS1_OEM_CONTROLLER_PLAYER_LIGHTS 0x62 typedef struct{ seqnum_t seqnum; uint32_t controller_type; -} PABB_PACK pabb_MsgInfo_NS1_OemController_PlayerLights; +} pabb_MsgInfo_NS1_OemController_PlayerLights; @@ -75,7 +68,7 @@ typedef struct{ seqnum_t seqnum; uint16_t milliseconds; pabb_NintendoSwitch_OemController_State0x30_Buttons buttons; -} PABB_PACK pabb_Message_Command_NS1_OemController_Buttons; +} pabb_Message_Command_NS1_OemController_Buttons; #define PABB_MSG_COMMAND_NS1_OEM_CONTROLLER_FULL_STATE 0xa1 @@ -83,7 +76,7 @@ typedef struct{ seqnum_t seqnum; uint16_t milliseconds; pabb_NintendoSwitch_OemController_State0x30 state; -} PABB_PACK pabb_Message_Command_NS1_OemController_FullState; +} pabb_Message_Command_NS1_OemController_FullState; @@ -94,9 +87,7 @@ typedef struct{ -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h b/Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h index b2d139f946..470554e46a 100644 --- a/Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h +++ b/Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h @@ -10,14 +10,7 @@ #include "../ControllerStates/NintendoSwitch_WiredController_State.h" #include "SerialPABotBase_Protocol.h" -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif #ifdef __cplusplus @@ -30,7 +23,7 @@ typedef struct{ seqnum_t seqnum; uint16_t milliseconds; pabb_NintendoSwitch_WiredController_State report; -} PABB_PACK pabb_Message_Command_NS_WiredController_State; +} pabb_Message_Command_NS_WiredController_State; @@ -39,8 +32,6 @@ typedef struct{ #endif -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/Common/SerialPABotBase/SerialPABotBase_Protocol.h b/Common/SerialPABotBase/SerialPABotBase_Protocol.h index fd7951fb28..a9d91d3f38 100644 --- a/Common/SerialPABotBase/SerialPABotBase_Protocol.h +++ b/Common/SerialPABotBase/SerialPABotBase_Protocol.h @@ -125,14 +125,7 @@ #include #include -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif #ifdef __cplusplus extern "C" { @@ -170,42 +163,42 @@ typedef uint32_t seqnum_t; #define PABB_MSG_ERROR_INVALID_MESSAGE 0x01 typedef struct{ uint8_t message_length; -} PABB_PACK pabb_MsgInfoInvalidMessage; +} pabb_MsgInfoInvalidMessage; #define PABB_MSG_ERROR_CHECKSUM_MISMATCH 0x02 typedef struct{ uint8_t message_length; -} PABB_PACK pabb_MsgInfoChecksumMismatch; +} pabb_MsgInfoChecksumMismatch; #define PABB_MSG_ERROR_INVALID_TYPE 0x03 typedef struct{ uint8_t type; -} PABB_PACK pabb_MsgInfoInvalidType; +} pabb_MsgInfoInvalidType; #define PABB_MSG_ERROR_INVALID_REQUEST 0x04 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgInfoInvalidRequest; +} pabb_MsgInfoInvalidRequest; #define PABB_MSG_ERROR_MISSED_REQUEST 0x05 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgInfoMissedRequest; +} pabb_MsgInfoMissedRequest; #define PABB_MSG_ERROR_COMMAND_DROPPED 0x06 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgInfoCommandDropped; +} pabb_MsgInfoCommandDropped; #define PABB_MSG_ERROR_WARNING 0x07 typedef struct{ uint16_t error_code; -} PABB_PACK pabb_MsgInfoWARNING; +} pabb_MsgInfoWARNING; #define PABB_MSG_ERROR_DISCONNECTED 0x08 typedef struct{ uint16_t error_code; -} PABB_PACK pabb_MsgInfoDisconnected; +} pabb_MsgInfoDisconnected; //////////////////////////////////////////////////////////////////////////////// // Ack @@ -213,35 +206,35 @@ typedef struct{ #define PABB_MSG_ACK_COMMAND 0x10 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgAckCommand; +} pabb_MsgAckCommand; #define PABB_MSG_ACK_REQUEST 0x11 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgAckRequest; +} pabb_MsgAckRequest; #define PABB_MSG_ACK_REQUEST_I8 0x12 typedef struct{ seqnum_t seqnum; uint8_t data; -} PABB_PACK pabb_MsgAckRequestI8; +} pabb_MsgAckRequestI8; #define PABB_MSG_ACK_REQUEST_I16 0x13 typedef struct{ seqnum_t seqnum; uint16_t data; -} PABB_PACK pabb_MsgAckRequestI16; +} pabb_MsgAckRequestI16; #define PABB_MSG_ACK_REQUEST_I32 0x14 typedef struct{ seqnum_t seqnum; uint32_t data; -} PABB_PACK pabb_MsgAckRequestI32; +} pabb_MsgAckRequestI32; #define PABB_MSG_ACK_REQUEST_DATA 0x1f typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgAckRequestData; +} pabb_MsgAckRequestData; //////////////////////////////////////////////////////////////////////////////// // Custom Info @@ -250,12 +243,12 @@ typedef struct{ typedef struct{ uint8_t tag; uint32_t data; -} PABB_PACK pabb_MsgInfoI32; +} pabb_MsgInfoI32; #define PABB_MSG_INFO_DATA 0x21 typedef struct{ uint32_t tag; -} PABB_PACK pabb_MsgInfoData; +} pabb_MsgInfoData; #define PABB_MSG_INFO_STRING 0x23 @@ -263,7 +256,7 @@ typedef struct{ #define PABB_MSG_INFO_H32_LABEL 0x25 typedef struct{ uint32_t value; -} PABB_PACK pabb_MsgInfoI32Label; +} pabb_MsgInfoI32Label; typedef uint8_t pabb_DeviceResetReason; #define PABB_DeviceResetReason_UNKNOWN 0x00 @@ -277,7 +270,7 @@ typedef uint8_t pabb_DeviceResetReason; typedef struct{ pabb_DeviceResetReason reason; uint32_t native_code; -} PABB_PACK pabb_MsgDeviceReset; +} pabb_MsgDeviceReset; //////////////////////////////////////////////////////////////////////////////// // Static Requests @@ -286,37 +279,37 @@ typedef struct{ // After you send this message, the next seqnum you should use is (seqnum + 1). typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgInfoSeqnumReset; +} pabb_MsgInfoSeqnumReset; #define PABB_MSG_REQUEST_PROTOCOL_VERSION 0x41 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestProtocolVersion; +} pabb_MsgRequestProtocolVersion; #define PABB_MSG_REQUEST_PROGRAM_VERSION 0x42 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestProgramVersion; +} pabb_MsgRequestProgramVersion; #define PABB_MSG_REQUEST_PROGRAM_ID 0x43 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestProgramID; +} pabb_MsgRequestProgramID; #define PABB_MSG_REQUEST_PROGRAM_NAME 0x44 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestProgramName; +} pabb_MsgRequestProgramName; #define PABB_MSG_REQUEST_CONTROLLER_LIST 0x45 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestControllerList; +} pabb_MsgRequestControllerList; #define PABB_MSG_REQUEST_QUEUE_SIZE 0x46 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestQueueSize; +} pabb_MsgRequestQueueSize; //////////////////////////////////////////////////////////////////////////////// // Mode Requests @@ -324,14 +317,14 @@ typedef struct{ #define PABB_MSG_REQUEST_READ_CONTROLLER_MODE 0x47 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestReadControllerMode; +} pabb_MsgRequestReadControllerMode; #define PABB_MSG_REQUEST_CHANGE_CONTROLLER_MODE 0x48 // Change controller and keep settings. #define PABB_MSG_REQUEST_RESET_TO_CONTROLLER 0x49 // Change controller and wipe settings. (unpair from host) typedef struct{ seqnum_t seqnum; uint32_t controller_id; -} PABB_PACK pabb_MsgRequestChangeControllerMode; +} pabb_MsgRequestChangeControllerMode; //////////////////////////////////////////////////////////////////////////////// // Command Queue Requests @@ -342,17 +335,17 @@ typedef struct{ seqnum_t seqnum; seqnum_t seq_of_original_command; uint32_t finish_time; -} PABB_PACK pabb_MsgRequestCommandFinished; +} pabb_MsgRequestCommandFinished; #define PABB_MSG_REQUEST_STOP 0x4b typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestStop; +} pabb_MsgRequestStop; #define PABB_MSG_REQUEST_NEXT_CMD_INTERRUPT 0x4c typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_MsgRequestNextCmdInterrupt; +} pabb_MsgRequestNextCmdInterrupt; //////////////////////////////////////////////////////////////////////////////// // Other Requests @@ -360,24 +353,24 @@ typedef struct{ #define PABB_MSG_REQUEST_CLOCK 0x4f // Deprecated typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_system_clock; +} pabb_system_clock; #define PABB_MSG_REQUEST_STATUS 0x50 typedef struct{ seqnum_t seqnum; -} PABB_PACK pabb_Message_RequestStatus; +} pabb_Message_RequestStatus; #define PABB_MSG_REQUEST_READ_MAC_ADDRESS 0x51 typedef struct{ seqnum_t seqnum; uint32_t mode; -} PABB_PACK pabb_MsgRequestReadMacAddress; +} pabb_MsgRequestReadMacAddress; #define PABB_MSG_REQUEST_PAIRED_MAC_ADDRESS 0x52 typedef struct{ seqnum_t seqnum; uint32_t mode; -} PABB_PACK pabb_MsgRequestPairedMacAddress; +} pabb_MsgRequestPairedMacAddress; //////////////////////////////////////////////////////////////////////////////// // Commands @@ -389,7 +382,7 @@ typedef struct{ typedef struct{ seqnum_t seqnum; bool on; -} PABB_PACK pabb_MsgCommandSetLeds; +} pabb_MsgCommandSetLeds; #endif //////////////////////////////////////////////////////////////////////////////// @@ -399,8 +392,6 @@ typedef struct{ } #endif -#if _WIN32 #pragma pack(pop) -#endif #endif diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp index 082d60c759..4ba3cface9 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp @@ -315,21 +315,12 @@ bool PABotBase2_OemController::run_preconnect_configure( controller_type ); -#if _WIN32 #pragma pack(push, 1) -#define PABB_PACK -#elif __GNUC__ -#define PABB_PACK __attribute__((packed)) -#else -#define PABB_PACK -#endif struct Message{ Message_NS1_OemController_Spi request; PABB_NintendoSwitch_ControllerColors colors; }; -#if _WIN32 #pragma pack(pop) -#endif Message message{}; { From f9d6425ce88c3a7da4a30c8ddb1829b3d22b11e4 Mon Sep 17 00:00:00 2001 From: PA Dev Bot <344001113+pa-devbot@users.noreply.github.com> Date: Tue, 10 Nov 2026 18:46:15 +0000 Subject: [PATCH 2/2] Sync PABB2_MESSAGE_PROTOCOL_VERSION to firmware's 2026061806 The PC copy was still at 2026061804 from the 2026-09-02 sync, while the firmware reports 2026061806. The constant is only informational on the PC side (compatibility is decided by SerialPABotBase::SUPPORTED_VERSIONS2()), but keeping the shared header byte-identical in both repos. --- Common/PABotBase2/PABotBase2_MessageProtocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/PABotBase2/PABotBase2_MessageProtocol.h b/Common/PABotBase2/PABotBase2_MessageProtocol.h index a77cbe7d44..e050a1c76a 100644 --- a/Common/PABotBase2/PABotBase2_MessageProtocol.h +++ b/Common/PABotBase2/PABotBase2_MessageProtocol.h @@ -16,7 +16,7 @@ namespace PABotBase2{ -#define PABB2_MESSAGE_PROTOCOL_VERSION 2026061804 +#define PABB2_MESSAGE_PROTOCOL_VERSION 2026061806 struct MessageHeader{