From 5d58534a8c1ad3cf17d2b40797de603d6e83de6d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 2 Nov 2023 14:31:09 +1100
Subject: [PATCH] LED drivers: use `PACKED` define from util.h (#22380)

---
 drivers/led/aw20216s.h               |  3 ++-
 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 +++++----
 drivers/led/snled27351-simple.h      |  3 ++-
 drivers/led/snled27351.h             |  3 ++-
 16 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/drivers/led/aw20216s.h b/drivers/led/aw20216s.h
index 0d6bd3c1890..7ad1e5653b4 100644
--- a/drivers/led/aw20216s.h
+++ b/drivers/led/aw20216s.h
@@ -20,6 +20,7 @@
 #include <stdbool.h>
 #include "progmem.h"
 #include "gpio.h"
+#include "util.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
 #ifdef DRIVER_COUNT
@@ -63,7 +64,7 @@ typedef struct aw20216s_led_t {
     uint8_t r;
     uint8_t g;
     uint8_t b;
-} aw20216s_led_t;
+} PACKED aw20216s_led_t;
 
 extern const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT];
 
diff --git a/drivers/led/issi/is31fl3218-simple.h b/drivers/led/issi/is31fl3218-simple.h
index 959990a93fd..0b5abca3410 100644
--- a/drivers/led/issi/is31fl3218-simple.h
+++ b/drivers/led/issi/is31fl3218-simple.h
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 c48bc2f2389..1d4f881e3c5 100644
--- a/drivers/led/issi/is31fl3218.h
+++ b/drivers/led/issi/is31fl3218.h
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 32504c1933a..185e80683b3 100644
--- a/drivers/led/issi/is31fl3731-simple.h
+++ b/drivers/led/issi/is31fl3731-simple.h
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 73fa0188970..77162ded30a 100644
--- a/drivers/led/issi/is31fl3731.h
+++ b/drivers/led/issi/is31fl3731.h
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 367af43c6a2..65d3298a50e 100644
--- a/drivers/led/issi/is31fl3733-simple.h
+++ b/drivers/led/issi/is31fl3733-simple.h
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 4902b3c1d7d..a8407f21548 100644
--- a/drivers/led/issi/is31fl3733.h
+++ b/drivers/led/issi/is31fl3733.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 88422ec3a45..cb751a917ef 100644
--- a/drivers/led/issi/is31fl3736-simple.h
+++ b/drivers/led/issi/is31fl3736-simple.h
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 b64fdf9d1c8..79d8c3276df 100644
--- a/drivers/led/issi/is31fl3736.h
+++ b/drivers/led/issi/is31fl3736.h
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 4c7af021763..dfc2189decb 100644
--- a/drivers/led/issi/is31fl3737-simple.h
+++ b/drivers/led/issi/is31fl3737-simple.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 fadab70c74f..38482584e03 100644
--- a/drivers/led/issi/is31fl3737.h
+++ b/drivers/led/issi/is31fl3737.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 d97591fa608..d022f3a865c 100644
--- a/drivers/led/issi/is31fl3741-simple.h
+++ b/drivers/led/issi/is31fl3741-simple.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 1febb6398b0..2b0e4495547 100644
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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 94ec9ae3ced..5414b540475 100644
--- a/drivers/led/issi/is31flcommon.h
+++ b/drivers/led/issi/is31flcommon.h
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #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
diff --git a/drivers/led/snled27351-simple.h b/drivers/led/snled27351-simple.h
index 64257202b97..051271cca8e 100644
--- a/drivers/led/snled27351-simple.h
+++ b/drivers/led/snled27351-simple.h
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "progmem.h"
+#include "util.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
 #ifdef DRIVER_COUNT
@@ -66,7 +67,7 @@
 typedef struct snled27351_led_t {
     uint8_t driver : 2;
     uint8_t v;
-} __attribute__((packed)) snled27351_led_t;
+} PACKED snled27351_led_t;
 
 extern const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT];
 
diff --git a/drivers/led/snled27351.h b/drivers/led/snled27351.h
index cecd552dbb5..dd60f59183d 100644
--- a/drivers/led/snled27351.h
+++ b/drivers/led/snled27351.h
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "progmem.h"
+#include "util.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
 #ifdef DRIVER_COUNT
@@ -80,7 +81,7 @@ typedef struct snled27351_led_t {
     uint8_t r;
     uint8_t g;
     uint8_t b;
-} __attribute__((packed)) snled27351_led_t;
+} PACKED snled27351_led_t;
 
 extern const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT];