Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Move PACKED define to util.h (#22074)

Browse source
This commit is contained in:
Ryan 2023-09-20 16:33:54 +10:00 • committed by GitHub
commit 2aacda3235
Failed to generate hash of commit
4 changed files with 7 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

15
quantum/color.h
View file

@ -18,6 +18,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "util.h"
// clang-format off // clang-format off
@ -73,16 +74,6 @@
// clang-format on // clang-format on
#if defined(__GNUC__)
# define PACKED __attribute__((__packed__))
#else
# define PACKED
#endif
#if defined(_MSC_VER)
# pragma pack(push, 1)
#endif
#define WS2812_BYTE_ORDER_RGB 0 #define WS2812_BYTE_ORDER_RGB 0
#define WS2812_BYTE_ORDER_GRB 1 #define WS2812_BYTE_ORDER_GRB 1
#define WS2812_BYTE_ORDER_BGR 2 #define WS2812_BYTE_ORDER_BGR 2
@ -118,10 +109,6 @@ typedef struct PACKED HSV {
uint8_t v; uint8_t v;
} HSV; } HSV;
#if defined(_MSC_VER)
# pragma pack(pop)
#endif
RGB hsv_to_rgb(HSV hsv); RGB hsv_to_rgb(HSV hsv);
RGB hsv_to_rgb_nocie(HSV hsv); RGB hsv_to_rgb_nocie(HSV hsv);
#ifdef RGBW #ifdef RGBW

15
quantum/led_matrix/led_matrix_types.h
View file

@ -18,16 +18,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "util.h"
#if defined(__GNUC__)
# define PACKED __attribute__((__packed__))
#else
# define PACKED
#endif
#if defined(_MSC_VER)
# pragma pack(push, 1)
#endif
#if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES) #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
# define LED_MATRIX_KEYREACTIVE_ENABLED # define LED_MATRIX_KEYREACTIVE_ENABLED
@ -92,7 +83,3 @@ typedef union {
} led_eeconfig_t; } led_eeconfig_t;
_Static_assert(sizeof(led_eeconfig_t) == sizeof(uint32_t), "LED Matrix EECONFIG out of spec."); _Static_assert(sizeof(led_eeconfig_t) == sizeof(uint32_t), "LED Matrix EECONFIG out of spec.");
#if defined(_MSC_VER)
# pragma pack(pop)
#endif

15
quantum/rgb_matrix/rgb_matrix_types.h
View file

@ -19,16 +19,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "color.h" #include "color.h"
#include "util.h"
#if defined(__GNUC__)
# define PACKED __attribute__((__packed__))
#else
# define PACKED
#endif
#if defined(_MSC_VER)
# pragma pack(push, 1)
#endif
#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
# define RGB_MATRIX_KEYREACTIVE_ENABLED # define RGB_MATRIX_KEYREACTIVE_ENABLED
@ -94,7 +85,3 @@ typedef union {
} rgb_config_t; } rgb_config_t;
_Static_assert(sizeof(rgb_config_t) == sizeof(uint64_t), "RGB Matrix EECONFIG out of spec."); _Static_assert(sizeof(rgb_config_t) == sizeof(uint64_t), "RGB Matrix EECONFIG out of spec.");
#if defined(_MSC_VER)
# pragma pack(pop)
#endif

4
quantum/util.h
View file

@ -46,3 +46,7 @@
*/ */
# define ARRAY_SIZE(array) (__builtin_choose_expr(IS_ARRAY((array)), sizeof((array)) / sizeof((array)[0]), (void)0)) # define ARRAY_SIZE(array) (__builtin_choose_expr(IS_ARRAY((array)), sizeof((array)) / sizeof((array)[0]), (void)0))
#endif #endif
#if !defined(PACKED)
# define PACKED __attribute__((__packed__))
#endif