From 49efa74e702c59cccf095305709e97dc27bf5557 Mon Sep 17 00:00:00 2001 From: fincs Date: Tue, 1 Jan 2019 03:27:43 +0100 Subject: [PATCH] Remove static_asserts from hid.h in order to avoid a hard dependency on C11 --- nx/include/switch/services/hid.h | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/nx/include/switch/services/hid.h b/nx/include/switch/services/hid.h index 0267a31d..b7185afa 100644 --- a/nx/include/switch/services/hid.h +++ b/nx/include/switch/services/hid.h @@ -6,7 +6,6 @@ * @copyright libnx Authors */ #pragma once -#include #include "../types.h" #include "../kernel/event.h" #include "../services/sm.h" @@ -379,14 +378,12 @@ typedef struct HidTouchScreenHeader u64 maxEntryIndex; u64 timestamp; } HidTouchScreenHeader; -static_assert(sizeof(HidTouchScreenHeader) == 0x28, "Hid touch screen header structure has incorrect size"); typedef struct HidTouchScreenEntryHeader { u64 timestamp; u64 numTouches; } HidTouchScreenEntryHeader; -static_assert(sizeof(HidTouchScreenEntryHeader) == 0x10, "Hid touch screen entry header structure has incorrect size"); typedef struct HidTouchScreenEntryTouch { @@ -400,7 +397,6 @@ typedef struct HidTouchScreenEntryTouch u32 angle; u32 padding_2; } HidTouchScreenEntryTouch; -static_assert(sizeof(HidTouchScreenEntryTouch) == 0x28, "Hid touch screen touch structure has incorrect size"); typedef struct HidTouchScreenEntry { @@ -408,7 +404,6 @@ typedef struct HidTouchScreenEntry HidTouchScreenEntryTouch touches[16]; u64 unk; } HidTouchScreenEntry; -static_assert(sizeof(HidTouchScreenEntry) == 0x298, "Hid touch screen entry structure has incorrect size"); typedef struct HidTouchScreen { @@ -416,7 +411,6 @@ typedef struct HidTouchScreen HidTouchScreenEntry entries[17]; u8 padding[0x3c0]; } HidTouchScreen; -static_assert(sizeof(HidTouchScreen) == 0x3000, "Hid touch screen structure has incorrect size"); // End HidTouchScreen @@ -429,7 +423,6 @@ typedef struct HidMouseHeader u64 latestEntry; u64 maxEntryIndex; } HidMouseHeader; -static_assert(sizeof(HidMouseHeader) == 0x20, "Hid mouse header structure has incorrect size"); typedef struct HidMouseEntry { @@ -438,7 +431,6 @@ typedef struct HidMouseEntry MousePosition position; u64 buttons; } HidMouseEntry; -static_assert(sizeof(HidMouseEntry) == 0x30, "Hid mouse entry structure has incorrect size"); typedef struct HidMouse { @@ -446,7 +438,6 @@ typedef struct HidMouse HidMouseEntry entries[17]; u8 padding[0xB0]; } HidMouse; -static_assert(sizeof(HidMouse) == 0x400, "Hid mouse structure has incorrect size"); // End HidMouse @@ -459,7 +450,6 @@ typedef struct HidKeyboardHeader u64 latestEntry; u64 maxEntryIndex; } HidKeyboardHeader; -static_assert(sizeof(HidKeyboardHeader) == 0x20, "Hid keyboard header structure has incorrect size"); typedef struct HidKeyboardEntry { @@ -468,7 +458,6 @@ typedef struct HidKeyboardEntry u64 modifier; u32 keys[8]; } HidKeyboardEntry; -static_assert(sizeof(HidKeyboardEntry) == 0x38, "Hid keyboard entry structure has incorrect size"); typedef struct HidKeyboard { @@ -476,7 +465,6 @@ typedef struct HidKeyboard HidKeyboardEntry entries[17]; u8 padding[0x28]; } HidKeyboard; -static_assert(sizeof(HidKeyboard) == 0x400, "Hid keyboard structure has incorrect size"); // End HidKeyboard @@ -489,7 +477,6 @@ typedef struct HidControllerMAC u64 unk; u64 timestamp_2; } HidControllerMAC; -static_assert(sizeof(HidControllerMAC) == 0x20, "Hid controller MAC structure has incorrect size"); typedef struct HidControllerHeader { @@ -504,7 +491,6 @@ typedef struct HidControllerHeader u32 rightColorBody; u32 rightColorButtons; } HidControllerHeader; -static_assert(sizeof(HidControllerHeader) == 0x28, "Hid controller header structure has incorrect size"); /// Info struct extracted from HidControllerHeader. /// Color fields are zero when not set. This can happen even when the *Set fields are set to true. @@ -528,7 +514,6 @@ typedef struct HidControllerLayoutHeader u64 latestEntry; u64 maxEntryIndex; } HidControllerLayoutHeader; -static_assert(sizeof(HidControllerLayoutHeader) == 0x20, "Hid controller layout header structure has incorrect size"); typedef struct HidControllerInputEntry { @@ -538,14 +523,12 @@ typedef struct HidControllerInputEntry JoystickPosition joysticks[JOYSTICK_NUM_STICKS]; u64 connectionState; } HidControllerInputEntry; -static_assert(sizeof(HidControllerInputEntry) == 0x30, "Hid controller input entry structure has incorrect size"); typedef struct HidControllerLayout { HidControllerLayoutHeader header; HidControllerInputEntry entries[17]; } HidControllerLayout; -static_assert(sizeof(HidControllerLayout) == 0x350, "Hid controller layout structure has incorrect size"); typedef struct HidControllerSixAxisHeader { @@ -554,7 +537,6 @@ typedef struct HidControllerSixAxisHeader u64 latestEntry; u64 maxEntryIndex; } HidControllerSixAxisHeader; -static_assert(sizeof(HidControllerSixAxisHeader) == 0x20, "Hid controller sixaxis header structure has incorrect size"); typedef struct HidControllerSixAxisEntry { @@ -564,14 +546,12 @@ typedef struct HidControllerSixAxisEntry SixAxisSensorValues values; u64 unk_3; } HidControllerSixAxisEntry; -static_assert(sizeof(HidControllerSixAxisEntry) == 0x68, "Hid controller sixaxis entry structure has incorrect size"); typedef struct HidControllerSixAxisLayout { HidControllerSixAxisHeader header; HidControllerSixAxisEntry entries[17]; } HidControllerSixAxisLayout; -static_assert(sizeof(HidControllerSixAxisLayout) == 0x708, "Hid controller sixaxis layout structure has incorrect size"); typedef struct HidController { @@ -583,7 +563,6 @@ typedef struct HidController HidControllerMAC macRight; u8 unk_2[0xDF8]; } HidController; -static_assert(sizeof(HidController) == 0x5000, "Hid controller structure has incorrect size"); // End HidController @@ -605,14 +584,12 @@ typedef struct HidSharedMemory HidController controllers[10]; u8 unkSection9[0x4600]; } HidSharedMemory; -static_assert(sizeof(HidSharedMemory) == 0x40000, "Hid Shared Memory structure has incorrect size"); typedef struct HidVibrationDeviceInfo { u32 unk_x0; u32 unk_x4; ///< 0x1 for left-joycon, 0x2 for right-joycon. } HidVibrationDeviceInfo; -static_assert(sizeof(HidVibrationDeviceInfo) == 0x8, "Hid VibrationDeviceInfo structure has incorrect size"); typedef struct HidVibrationValue { @@ -621,7 +598,6 @@ typedef struct HidVibrationValue float amp_high; ///< High Band amplitude. 1.0f: Max amplitude. float freq_high; ///< High Band frequency in Hz. } HidVibrationValue; -static_assert(sizeof(HidVibrationValue) == 0x10, "Hid VibrationValue structure has incorrect size"); Result hidInitialize(void); void hidExit(void);