Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move PACKED define to util.h #22074

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Move PACKED define to util.h #22074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions quantum/color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <stdint.h>
#include <stdbool.h>
#include "util.h"

// clang-format off

Expand Down Expand Up @@ -73,16 +74,6 @@

// 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_GRB 1
#define WS2812_BYTE_ORDER_BGR 2
Expand Down Expand Up @@ -118,10 +109,6 @@ typedef struct PACKED HSV {
uint8_t v;
} HSV;

#if defined(_MSC_VER)
# pragma pack(pop)
#endif

RGB hsv_to_rgb(HSV hsv);
RGB hsv_to_rgb_nocie(HSV hsv);
#ifdef RGBW
Expand Down
15 changes: 1 addition & 14 deletions quantum/led_matrix/led_matrix_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@

#include <stdint.h>
#include <stdbool.h>

#if defined(__GNUC__)
# define PACKED __attribute__((__packed__))
#else
# define PACKED
#endif

#if defined(_MSC_VER)
# pragma pack(push, 1)
#endif
#include "util.h"

#if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
# define LED_MATRIX_KEYREACTIVE_ENABLED
Expand Down Expand Up @@ -92,7 +83,3 @@ typedef union {
} led_eeconfig_t;

_Static_assert(sizeof(led_eeconfig_t) == sizeof(uint32_t), "LED Matrix EECONFIG out of spec.");

#if defined(_MSC_VER)
# pragma pack(pop)
#endif
15 changes: 1 addition & 14 deletions quantum/rgb_matrix/rgb_matrix_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "color.h"

#if defined(__GNUC__)
# define PACKED __attribute__((__packed__))
#else
# define PACKED
#endif

#if defined(_MSC_VER)
# pragma pack(push, 1)
#endif
#include "util.h"

#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
# define RGB_MATRIX_KEYREACTIVE_ENABLED
Expand Down Expand Up @@ -94,7 +85,3 @@ typedef union {
} rgb_config_t;

_Static_assert(sizeof(rgb_config_t) == sizeof(uint64_t), "RGB Matrix EECONFIG out of spec.");

#if defined(_MSC_VER)
# pragma pack(pop)
#endif
4 changes: 4 additions & 0 deletions quantum/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,7 @@
*/
# define ARRAY_SIZE(array) (__builtin_choose_expr(IS_ARRAY((array)), sizeof((array)) / sizeof((array)[0]), (void)0))
#endif

#if !defined(PACKED)
# define PACKED __attribute__((__packed__))
#endif