From 5d58534a8c1ad3cf17d2b40797de603d6e83de6d Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 2 Nov 2023 14:31:09 +1100 Subject: LED drivers: use `PACKED` define from util.h (#22380) --- drivers/led/issi/is31fl3218-simple.h | 3 ++- drivers/led/issi/is31fl3218.h | 3 ++- drivers/led/issi/is31fl3731-simple.h | 3 ++- drivers/led/issi/is31fl3731.h | 3 ++- drivers/led/issi/is31fl3733-simple.h | 3 ++- drivers/led/issi/is31fl3733.h | 3 ++- drivers/led/issi/is31fl3736-simple.h | 3 ++- drivers/led/issi/is31fl3736.h | 3 ++- drivers/led/issi/is31fl3737-simple.h | 3 ++- drivers/led/issi/is31fl3737.h | 3 ++- drivers/led/issi/is31fl3741-simple.h | 7 ++++--- drivers/led/issi/is31fl3741.h | 11 ++++++----- drivers/led/issi/is31flcommon.h | 9 +++++---- 13 files changed, 35 insertions(+), 22 deletions(-) (limited to 'drivers/led/issi') diff --git a/drivers/led/issi/is31fl3218-simple.h b/drivers/led/issi/is31fl3218-simple.h index 959990a93f..0b5abca341 100644 --- a/drivers/led/issi/is31fl3218-simple.h +++ b/drivers/led/issi/is31fl3218-simple.h @@ -19,6 +19,7 @@ #include #include #include "progmem.h" +#include "util.h" #define IS31FL3218_I2C_ADDRESS 0x54 @@ -28,7 +29,7 @@ typedef struct is31fl3218_led_t { uint8_t v; -} __attribute__((packed)) is31fl3218_led_t; +} PACKED is31fl3218_led_t; extern const is31fl3218_led_t PROGMEM g_is31fl3218_leds[IS31FL3218_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3218.h b/drivers/led/issi/is31fl3218.h index c48bc2f238..1d4f881e3c 100644 --- a/drivers/led/issi/is31fl3218.h +++ b/drivers/led/issi/is31fl3218.h @@ -19,6 +19,7 @@ #include #include #include "progmem.h" +#include "util.h" #define IS31FL3218_I2C_ADDRESS 0x54 @@ -30,7 +31,7 @@ typedef struct is31fl3218_led_t { uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31fl3218_led_t; +} PACKED is31fl3218_led_t; extern const is31fl3218_led_t PROGMEM g_is31fl3218_leds[IS31FL3218_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3731-simple.h b/drivers/led/issi/is31fl3731-simple.h index 32504c1933..185e80683b 100644 --- a/drivers/led/issi/is31fl3731-simple.h +++ b/drivers/led/issi/is31fl3731-simple.h @@ -21,6 +21,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef LED_DRIVER_ADDR_1 @@ -64,7 +65,7 @@ typedef struct is31fl3731_led_t { uint8_t driver : 2; uint8_t v; -} __attribute__((packed)) is31fl3731_led_t; +} PACKED is31fl3731_led_t; extern const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3731.h b/drivers/led/issi/is31fl3731.h index 73fa018897..77162ded30 100644 --- a/drivers/led/issi/is31fl3731.h +++ b/drivers/led/issi/is31fl3731.h @@ -20,6 +20,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_ADDR_1 @@ -65,7 +66,7 @@ typedef struct is31fl3731_led_t { uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31fl3731_led_t; +} PACKED is31fl3731_led_t; extern const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3733-simple.h b/drivers/led/issi/is31fl3733-simple.h index 367af43c6a..65d3298a50 100644 --- a/drivers/led/issi/is31fl3733-simple.h +++ b/drivers/led/issi/is31fl3733-simple.h @@ -23,6 +23,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef LED_DRIVER_COUNT @@ -83,7 +84,7 @@ typedef struct is31fl3733_led_t { uint8_t driver : 2; uint8_t v; -} __attribute__((packed)) is31fl3733_led_t; +} PACKED is31fl3733_led_t; extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3733.h b/drivers/led/issi/is31fl3733.h index 4902b3c1d7..a8407f2154 100644 --- a/drivers/led/issi/is31fl3733.h +++ b/drivers/led/issi/is31fl3733.h @@ -22,6 +22,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_ADDR_1 @@ -108,7 +109,7 @@ typedef struct is31fl3733_led_t { uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31fl3733_led_t; +} PACKED is31fl3733_led_t; extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3736-simple.h b/drivers/led/issi/is31fl3736-simple.h index 88422ec3a4..cb751a917e 100644 --- a/drivers/led/issi/is31fl3736-simple.h +++ b/drivers/led/issi/is31fl3736-simple.h @@ -20,6 +20,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_COUNT @@ -78,7 +79,7 @@ typedef struct is31fl3736_led_t { uint8_t driver : 2; uint8_t v; -} __attribute__((packed)) is31fl3736_led_t; +} PACKED is31fl3736_led_t; extern const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3736.h b/drivers/led/issi/is31fl3736.h index b64fdf9d1c..79d8c3276d 100644 --- a/drivers/led/issi/is31fl3736.h +++ b/drivers/led/issi/is31fl3736.h @@ -20,6 +20,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_ADDR_1 @@ -92,7 +93,7 @@ typedef struct is31fl3736_led_t { uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31fl3736_led_t; +} PACKED is31fl3736_led_t; extern const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3737-simple.h b/drivers/led/issi/is31fl3737-simple.h index 4c7af02176..dfc2189dec 100644 --- a/drivers/led/issi/is31fl3737-simple.h +++ b/drivers/led/issi/is31fl3737-simple.h @@ -22,6 +22,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_COUNT @@ -68,7 +69,7 @@ typedef struct is31fl3737_led_t { uint8_t driver : 2; uint8_t v; -} __attribute__((packed)) is31fl3737_led_t; +} PACKED is31fl3737_led_t; extern const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3737.h b/drivers/led/issi/is31fl3737.h index fadab70c74..38482584e0 100644 --- a/drivers/led/issi/is31fl3737.h +++ b/drivers/led/issi/is31fl3737.h @@ -22,6 +22,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_ADDR_1 @@ -85,7 +86,7 @@ typedef struct is31fl3737_led_t { uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31fl3737_led_t; +} PACKED is31fl3737_led_t; extern const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3741-simple.h b/drivers/led/issi/is31fl3741-simple.h index d97591fa60..d022f3a865 100644 --- a/drivers/led/issi/is31fl3741-simple.h +++ b/drivers/led/issi/is31fl3741-simple.h @@ -22,6 +22,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_COUNT @@ -66,9 +67,9 @@ #endif typedef struct is31fl3741_led_t { - uint32_t driver : 2; - uint32_t v : 10; -} __attribute__((packed)) is31fl3741_led_t; + uint8_t driver : 2; + uint16_t v : 9; +} PACKED is31fl3741_led_t; extern const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT]; diff --git a/drivers/led/issi/is31fl3741.h b/drivers/led/issi/is31fl3741.h index 1febb6398b..2b0e449554 100644 --- a/drivers/led/issi/is31fl3741.h +++ b/drivers/led/issi/is31fl3741.h @@ -22,6 +22,7 @@ #include #include #include "progmem.h" +#include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef DRIVER_ADDR_1 @@ -81,11 +82,11 @@ #endif typedef struct is31fl3741_led_t { - uint32_t driver : 2; - uint32_t r : 10; - uint32_t g : 10; - uint32_t b : 10; -} __attribute__((packed)) is31fl3741_led_t; + uint8_t driver : 2; + uint16_t r : 9; + uint16_t g : 9; + uint16_t b : 9; +} PACKED is31fl3741_led_t; extern const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT]; diff --git a/drivers/led/issi/is31flcommon.h b/drivers/led/issi/is31flcommon.h index 94ec9ae3ce..5414b54047 100644 --- a/drivers/led/issi/is31flcommon.h +++ b/drivers/led/issi/is31flcommon.h @@ -23,6 +23,7 @@ #include #include #include "progmem.h" +#include "util.h" // Which variant header file to use #if defined(LED_MATRIX_IS31FL3742A) || defined(RGB_MATRIX_IS31FL3742A) @@ -37,19 +38,19 @@ #ifdef RGB_MATRIX_ENABLE typedef struct is31_led { - uint8_t driver; + uint8_t driver : 2; uint8_t r; uint8_t g; uint8_t b; -} __attribute__((packed)) is31_led; +} PACKED is31_led; extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT]; #elif defined(LED_MATRIX_ENABLE) typedef struct is31_led { - uint8_t driver; + uint8_t driver : 2; uint8_t v; -} __attribute__((packed)) is31_led; +} PACKED is31_led; extern const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT]; #endif -- cgit v1.2.3