Merge remote-tracking branch 'origin/master' into develop

drivers/haptic/solenoid.h

@@ -47,8 +47,7 @@
 
 #ifndef SOLENOID_PINS
 #    ifdef SOLENOID_PIN
-#        define SOLENOID_PINS \
+#        define SOLENOID_PINS {SOLENOID_PIN}
-            { SOLENOID_PIN }
 #    else
 #        error SOLENOID_PINS array not defined
 #    endif

drivers/led/snled27351-mono.c

@@ -34,8 +34,7 @@
 #endif
 
 #ifndef SNLED27351_CURRENT_TUNE
-#    define SNLED27351_CURRENT_TUNE \
+#    define SNLED27351_CURRENT_TUNE {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
-        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 #endif
 
 const uint8_t i2c_addresses[SNLED27351_DRIVER_COUNT] = {

drivers/led/snled27351.c

@@ -34,8 +34,7 @@
 #endif
 
 #ifndef SNLED27351_CURRENT_TUNE
-#    define SNLED27351_CURRENT_TUNE \
+#    define SNLED27351_CURRENT_TUNE {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
-        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 #endif
 
 const uint8_t i2c_addresses[SNLED27351_DRIVER_COUNT] = {

drivers/oled/oled_driver.c

@@ -301,24 +301,18 @@ bool oled_init(oled_rotation_t rotation) {
     oled_driver_init();
 
     static const uint8_t PROGMEM display_setup1[] = {
-        I2C_CMD,
+        I2C_CMD, DISPLAY_OFF, DISPLAY_CLOCK, OLED_DISPLAY_CLOCK, MULTIPLEX_RATIO,
-        DISPLAY_OFF,
-        DISPLAY_CLOCK,
-        OLED_DISPLAY_CLOCK,
-        MULTIPLEX_RATIO,
 #if OLED_IC_COM_PINS_ARE_COLUMNS
         OLED_DISPLAY_WIDTH - 1,
 #else
         OLED_DISPLAY_HEIGHT - 1,
 #endif
 #if OLED_IC == OLED_IC_SH1107
-        SH1107_DISPLAY_START_LINE,
+        SH1107_DISPLAY_START_LINE, 0x00,
-        0x00,
 #else
         DISPLAY_START_LINE | 0x00,
 #endif
-        CHARGE_PUMP,
+        CHARGE_PUMP, 0x14,
-        0x14,
 #if OLED_IC_HAS_HORIZONTAL_MODE
         // MEMORY_MODE is unsupported on SH1106 (Page Addressing only)
         MEMORY_MODE,

drivers/oled/oled_driver.h

@@ -53,12 +53,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // For 90 degree rotation, we map our internal matrix to oled matrix using fixed arrays
 // The OLED writes to it's memory horizontally, starting top left, but our memory starts bottom left in this mode
 #    ifndef OLED_SOURCE_MAP
-#        define OLED_SOURCE_MAP \
+#        define OLED_SOURCE_MAP {0, 8, 16, 24, 32, 40, 48, 56}
-            { 0, 8, 16, 24, 32, 40, 48, 56 }
 #    endif
 #    ifndef OLED_TARGET_MAP
-#        define OLED_TARGET_MAP \
+#        define OLED_TARGET_MAP {56, 48, 40, 32, 24, 16, 8, 0}
-            { 56, 48, 40, 32, 24, 16, 8, 0 }
 #    endif
 // If OLED_BLOCK_TYPE is uint32_t, these tables would look like:
 // #define OLED_SOURCE_MAP { 32, 40, 48, 56 }
@@ -97,12 +95,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 
 #    ifndef OLED_SOURCE_MAP
-#        define OLED_SOURCE_MAP \
+#        define OLED_SOURCE_MAP {0, 8, 16, 24}
-            { 0, 8, 16, 24 }
 #    endif
 #    ifndef OLED_TARGET_MAP
-#        define OLED_TARGET_MAP \
+#        define OLED_TARGET_MAP {24, 16, 8, 0}
-            { 24, 16, 8, 0 }
 #    endif
 
 #elif defined(OLED_DISPLAY_64X48)
@@ -132,12 +128,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 
 #    ifndef OLED_SOURCE_MAP
-#        define OLED_SOURCE_MAP \
+#        define OLED_SOURCE_MAP {0, 8}
-            { 0, 8 }
 #    endif
 #    ifndef OLED_TARGET_MAP
-#        define OLED_TARGET_MAP \
+#        define OLED_TARGET_MAP {8, 0}
-            { 8, 0 }
 #    endif
 
 #elif defined(OLED_DISPLAY_64X128)
@@ -170,12 +164,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 
 #    ifndef OLED_SOURCE_MAP
-#        define OLED_SOURCE_MAP \
+#        define OLED_SOURCE_MAP {0, 8, 16, 24, 32, 40, 48, 56}
-            { 0, 8, 16, 24, 32, 40, 48, 56 }
 #    endif
 #    ifndef OLED_TARGET_MAP
-#        define OLED_TARGET_MAP \
+#        define OLED_TARGET_MAP {56, 48, 40, 32, 24, 16, 8, 0}
-            { 56, 48, 40, 32, 24, 16, 8, 0 }
 #    endif
 
 #elif defined(OLED_DISPLAY_128X128)
@@ -208,12 +200,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // For 90 degree rotation, we map our internal matrix to oled matrix using fixed arrays
 // The OLED writes to it's memory horizontally, starting top left, but our memory starts bottom left in this mode
 #    ifndef OLED_SOURCE_MAP
-#        define OLED_SOURCE_MAP \
+#        define OLED_SOURCE_MAP {0, 8, 16, 24, 32, 40, 48, 56}
-            { 0, 8, 16, 24, 32, 40, 48, 56 }
 #    endif
 #    ifndef OLED_TARGET_MAP
-#        define OLED_TARGET_MAP \
+#        define OLED_TARGET_MAP {56, 48, 40, 32, 24, 16, 8, 0}
-            { 56, 48, 40, 32, 24, 16, 8, 0 }
 #    endif
 #else // defined(OLED_DISPLAY_128X64)
 // Default 128x32
@@ -242,12 +232,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // For 90 degree rotation, we map our internal matrix to oled matrix using fixed arrays
 // The OLED writes to it's memory horizontally, starting top left, but our memory starts bottom left in this mode
 #    ifndef OLED_SOURCE_MAP
-#        define OLED_SOURCE_MAP \
+#        define OLED_SOURCE_MAP {0, 8, 16, 24}
-            { 0, 8, 16, 24 }
 #    endif
 #    ifndef OLED_TARGET_MAP
-#        define OLED_TARGET_MAP \
+#        define OLED_TARGET_MAP {24, 16, 8, 0}
-            { 24, 16, 8, 0 }
 #    endif
 // If OLED_BLOCK_TYPE is uint8_t, these tables would look like:
 // #define OLED_SOURCE_MAP { 0, 8, 16, 24, 32, 40, 48, 56 }

drivers/sensors/pmw33xx_common.h

@@ -72,14 +72,12 @@ STATIC_ASSERT(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.motio
 #    ifndef PMW33XX_CS_PIN
 #        ifdef POINTING_DEVICE_CS_PIN
 #            define PMW33XX_CS_PIN POINTING_DEVICE_CS_PIN
-#            define PMW33XX_CS_PINS \
+#            define PMW33XX_CS_PINS {PMW33XX_CS_PIN}
-                { PMW33XX_CS_PIN }
 #        else
 #            error "No chip select pin defined -- missing PMW33XX_CS_PIN or PMW33XX_CS_PINS"
 #        endif
 #    else
-#        define PMW33XX_CS_PINS \
+#        define PMW33XX_CS_PINS {PMW33XX_CS_PIN}
-            { PMW33XX_CS_PIN }
 #    endif
 #endif
 
@@ -88,8 +86,7 @@ STATIC_ASSERT(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.motio
 #    if !defined(PMW33XX_CS_PIN_RIGHT)
 #        define PMW33XX_CS_PIN_RIGHT PMW33XX_CS_PIN
 #    endif
-#    define PMW33XX_CS_PINS_RIGHT \
+#    define PMW33XX_CS_PINS_RIGHT {PMW33XX_CS_PIN_RIGHT}
-        { PMW33XX_CS_PIN_RIGHT }
 #endif
 
 // Defines so the old variable names are swapped by the appropiate value on each half

platforms/chibios/drivers/ws2812_spi.c

@@ -188,8 +188,7 @@ void ws2812_init(void) {
         0,
         WS2812_SPI_DIVISOR
 #    else
-        WS2812_SPI_DIVISOR_CR1_BR_X,
+        WS2812_SPI_DIVISOR_CR1_BR_X, 0
-        0
 #    endif
 #else
     // HAL_SPI_V2

quantum/action_util.h

@@ -135,8 +135,7 @@ void clear_oneshot_swaphands(void);
 void neutralize_flashing_modifiers(uint8_t active_mods);
 #endif
 #ifndef MODS_TO_NEUTRALIZE
-#    define MODS_TO_NEUTRALIZE \
+#    define MODS_TO_NEUTRALIZE {MOD_BIT(KC_LEFT_ALT), MOD_BIT(KC_LEFT_GUI)}
-        { MOD_BIT(KC_LEFT_ALT), MOD_BIT(KC_LEFT_GUI) }
 #endif
 
 #ifdef __cplusplus

quantum/audio/musical_notes.h

@@ -21,12 +21,10 @@
 // in beats-per-minute
 #endif
 
-#define SONG(notes...) \
+#define SONG(notes...) {notes}
-    { notes }
 
 // Note Types
-#define MUSICAL_NOTE(note, duration) \
+#define MUSICAL_NOTE(note, duration) {(NOTE##note), duration}
-    { (NOTE##note), duration }
 
 #define BREVE_NOTE(note) MUSICAL_NOTE(note, 128)
 #define WHOLE_NOTE(note) MUSICAL_NOTE(note, 64)

quantum/backlight/backlight_driver_common.c

@@ -16,7 +16,9 @@ static const pin_t backlight_pins[] = BACKLIGHT_PINS;
 #    define FOR_EACH_LED(x)                                 \
         for (uint8_t i = 0; i < BACKLIGHT_LED_COUNT; i++) { \
             pin_t backlight_pin = backlight_pins[i];        \
-            { x }                                           \
+            {                                               \
+                x                                           \
+            }                                               \
         }
 #else
 // we support only one backlight pin

quantum/dip_switch.h

@@ -49,7 +49,6 @@ void dip_switch_task(void);
 
 #ifdef DIP_SWITCH_MAP_ENABLE
 #    define NUM_DIP_STATES 2
-#    define DIP_SWITCH_OFF_ON(off, on) \
+#    define DIP_SWITCH_OFF_ON(off, on) {(off), (on)}
-        { (off), (on) }
 extern const uint16_t dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES];
 #endif // DIP_SWITCH_MAP_ENABLE

quantum/encoder.h

@@ -111,8 +111,7 @@ void encoder_signal_queue_drain(void);
 
 #    ifdef ENCODER_MAP_ENABLE
 #        define NUM_DIRECTIONS 2
-#        define ENCODER_CCW_CW(ccw, cw) \
+#        define ENCODER_CCW_CW(ccw, cw) {(cw), (ccw)}
-            { (cw), (ccw) }
 extern const uint16_t encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS];
 #    endif // ENCODER_MAP_ENABLE
 

quantum/encoder/tests/config_mock.h

@@ -7,10 +7,8 @@
 #define MATRIX_COLS 1
 
 /* Here, "pins" from 0 to 31 are allowed. */
-#define ENCODER_A_PINS \
+#define ENCODER_A_PINS {0}
-    { 0 }
+#define ENCODER_B_PINS {1}
-#define ENCODER_B_PINS \
-    { 1 }
 
 #ifdef __cplusplus
 extern "C" {

quantum/encoder/tests/config_mock_split_left_eq_right.h

@@ -7,14 +7,10 @@
 #define MATRIX_COLS 1
 
 /* Here, "pins" from 0 to 31 are allowed. */
-#define ENCODER_A_PINS \
+#define ENCODER_A_PINS {0, 2}
-    { 0, 2 }
+#define ENCODER_B_PINS {1, 3}
-#define ENCODER_B_PINS \
+#define ENCODER_A_PINS_RIGHT {4, 6}
-    { 1, 3 }
+#define ENCODER_B_PINS_RIGHT {5, 7}
-#define ENCODER_A_PINS_RIGHT \
-    { 4, 6 }
-#define ENCODER_B_PINS_RIGHT \
-    { 5, 7 }
 
 #ifdef __cplusplus
 extern "C" {

quantum/encoder/tests/config_mock_split_left_gt_right.h

@@ -7,14 +7,10 @@
 #define MATRIX_COLS 1
 
 /* Here, "pins" from 0 to 31 are allowed. */
-#define ENCODER_A_PINS \
+#define ENCODER_A_PINS {0, 2, 4}
-    { 0, 2, 4 }
+#define ENCODER_B_PINS {1, 3, 5}
-#define ENCODER_B_PINS \
+#define ENCODER_A_PINS_RIGHT {6, 8}
-    { 1, 3, 5 }
+#define ENCODER_B_PINS_RIGHT {7, 9}
-#define ENCODER_A_PINS_RIGHT \
-    { 6, 8 }
-#define ENCODER_B_PINS_RIGHT \
-    { 7, 9 }
 
 #ifdef __cplusplus
 extern "C" {

quantum/encoder/tests/config_mock_split_left_lt_right.h

@@ -7,14 +7,10 @@
 #define MATRIX_COLS 1
 
 /* Here, "pins" from 0 to 31 are allowed. */
-#define ENCODER_A_PINS \
+#define ENCODER_A_PINS {0, 2}
-    { 0, 2 }
+#define ENCODER_B_PINS {1, 3}
-#define ENCODER_B_PINS \
+#define ENCODER_A_PINS_RIGHT {4, 6, 8}
-    { 1, 3 }
+#define ENCODER_B_PINS_RIGHT {5, 7, 9}
-#define ENCODER_A_PINS_RIGHT \
-    { 4, 6, 8 }
-#define ENCODER_B_PINS_RIGHT \
-    { 5, 7, 9 }
 
 #ifdef __cplusplus
 extern "C" {

quantum/encoder/tests/config_mock_split_no_left.h

@@ -8,13 +8,13 @@
 
 /* Here, "pins" from 0 to 31 are allowed. */
 #define ENCODER_A_PINS \
-    {}
+    {                  \
+    }
 #define ENCODER_B_PINS \
-    {}
+    {                  \
-#define ENCODER_A_PINS_RIGHT \
+    }
-    { 0, 2 }
+#define ENCODER_A_PINS_RIGHT {0, 2}
-#define ENCODER_B_PINS_RIGHT \
+#define ENCODER_B_PINS_RIGHT {1, 3}
-    { 1, 3 }
 
 #ifdef __cplusplus
 extern "C" {

quantum/encoder/tests/config_mock_split_no_right.h

@@ -7,14 +7,14 @@
 #define MATRIX_COLS 1
 
 /* Here, "pins" from 0 to 31 are allowed. */
-#define ENCODER_A_PINS \
+#define ENCODER_A_PINS {0, 2}
-    { 0, 2 }
+#define ENCODER_B_PINS {1, 3}
-#define ENCODER_B_PINS \
-    { 1, 3 }
 #define ENCODER_A_PINS_RIGHT \
-    {}
+    {                        \
+    }
 #define ENCODER_B_PINS_RIGHT \
-    {}
+    {                        \
+    }
 
 #ifdef __cplusplus
 extern "C" {

quantum/encoder/tests/config_mock_split_role.h

@@ -7,14 +7,10 @@
 #define MATRIX_COLS 1
 
 /* Here, "pins" from 0 to 31 are allowed. */
-#define ENCODER_A_PINS \
+#define ENCODER_A_PINS {0, 2}
-    { 0, 2 }
+#define ENCODER_B_PINS {1, 3}
-#define ENCODER_B_PINS \
+#define ENCODER_A_PINS_RIGHT {4, 6}
-    { 1, 3 }
+#define ENCODER_B_PINS_RIGHT {5, 7}
-#define ENCODER_A_PINS_RIGHT \
-    { 4, 6 }
-#define ENCODER_B_PINS_RIGHT \
-    { 5, 7 }
 
 #ifdef __cplusplus
 extern "C" {

quantum/joystick.h

@@ -64,10 +64,8 @@
 
 // configure on input_pin of the joystick_axes array entry to NO_PIN
 // to prevent it from being read from the ADC. This allows outputting forged axis value.
-#define JOYSTICK_AXIS_VIRTUAL \
+#define JOYSTICK_AXIS_VIRTUAL {NO_PIN, 0, JOYSTICK_MAX_VALUE / 2, JOYSTICK_MAX_VALUE}
-    { NO_PIN, 0, JOYSTICK_MAX_VALUE / 2, JOYSTICK_MAX_VALUE }
+#define JOYSTICK_AXIS_IN(INPUT_PIN, LOW, REST, HIGH) {INPUT_PIN, LOW, REST, HIGH}
-#define JOYSTICK_AXIS_IN(INPUT_PIN, LOW, REST, HIGH) \
-    { INPUT_PIN, LOW, REST, HIGH }
 
 typedef struct {
     pin_t input_pin;

quantum/process_keycode/process_combo.h

@@ -57,10 +57,8 @@ typedef struct combo_t {
 #endif
 } combo_t;
 
-#define COMBO(ck, ca) \
+#define COMBO(ck, ca) {.keys = &(ck)[0], .keycode = (ca)}
-    { .keys = &(ck)[0], .keycode = (ca) }
+#define COMBO_ACTION(ck) {.keys = &(ck)[0]}
-#define COMBO_ACTION(ck) \
-    { .keys = &(ck)[0] }
 
 #define COMBO_END 0
 #ifndef COMBO_TERM

quantum/process_keycode/process_key_override.c

@@ -39,7 +39,8 @@
 #    define key_override_printf dprintf
 #else
 #    define key_override_printf(str, ...) \
-        {}
+        {                                 \
+        }
 #endif
 
 // Helpers

quantum/process_keycode/process_tap_dance.h

@@ -59,22 +59,40 @@ typedef struct {
 } tap_dance_dual_role_t;
 
 #define ACTION_TAP_DANCE_DOUBLE(kc1, kc2)                                                               \
-    { .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset, NULL}, .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), }
+    {                                                                                                   \
+        .fn        = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset, NULL}, \
+        .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}),                                           \
+    }
 
 #define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer)                                                                         \
-    { .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), }
+    {                                                                                                                  \
+        .fn        = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, \
+        .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}),                                        \
+    }
 
 #define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer)                                            \
-    { .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), }
+    {                                                                                       \
+        .fn        = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, \
+        .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}),           \
+    }
 
 #define ACTION_TAP_DANCE_FN(user_fn)              \
-    { .fn = {NULL, user_fn, NULL, NULL}, .user_data = NULL, }
+    {                                             \
+        .fn        = {NULL, user_fn, NULL, NULL}, \
+        .user_data = NULL,                        \
+    }
 
 #define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) \
-    { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, NULL}, .user_data = NULL, }
+    {                                                                                                        \
+        .fn        = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, NULL},         \
+        .user_data = NULL,                                                                                   \
+    }
 
 #define ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(user_fn_on_each_tap, user_fn_on_each_release, user_fn_on_dance_finished, user_fn_on_dance_reset) \
-    { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, user_fn_on_each_release}, .user_data = NULL, }
+    {                                                                                                                                              \
+        .fn        = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, user_fn_on_each_release},                            \
+        .user_data = NULL,                                                                                                                         \
+    }
 
 #define TD_INDEX(code) QK_TAP_DANCE_GET_INDEX(code)
 #define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions)

quantum/rgblight/rgblight.h

@@ -186,8 +186,7 @@ typedef struct {
 #    define RGBLIGHT_USE_TIMER
 
 #    define RGBLIGHT_END_SEGMENT_INDEX (255)
-#    define RGBLIGHT_END_SEGMENTS \
+#    define RGBLIGHT_END_SEGMENTS {RGBLIGHT_END_SEGMENT_INDEX, 0, 0, 0}
-        { RGBLIGHT_END_SEGMENT_INDEX, 0, 0, 0 }
 #    ifndef RGBLIGHT_MAX_LAYERS
 #        define RGBLIGHT_MAX_LAYERS 8
 #    endif
@@ -202,10 +201,8 @@ typedef uint32_t rgblight_layer_mask_t;
 #    else
 #        error invalid RGBLIGHT_MAX_LAYERS value (must be <= 32)
 #    endif
-#    define RGBLIGHT_LAYER_SEGMENTS(...) \
+#    define RGBLIGHT_LAYER_SEGMENTS(...) {__VA_ARGS__, RGBLIGHT_END_SEGMENTS}
-        { __VA_ARGS__, RGBLIGHT_END_SEGMENTS }
+#    define RGBLIGHT_LAYERS_LIST(...) {__VA_ARGS__, NULL}
-#    define RGBLIGHT_LAYERS_LIST(...) \
-        { __VA_ARGS__, NULL }
 
 // Get/set enabled rgblight layers
 void rgblight_set_layer_state(uint8_t layer, bool enabled);

quantum/secure.c

@@ -14,10 +14,7 @@
 #endif
 
 #ifndef SECURE_UNLOCK_SEQUENCE
-#    define SECURE_UNLOCK_SEQUENCE \
+#    define SECURE_UNLOCK_SEQUENCE {{0, 0}}
-        {                          \
-            { 0, 0 }               \
-        }
 #endif
 
 static secure_status_t secure_status = SECURE_LOCKED;

quantum/split_common/transactions.c

@@ -73,16 +73,13 @@
 
 #define sizeof_member(type, member) sizeof(((type *)NULL)->member)
 
-#define trans_initiator2target_initializer_cb(member, cb) \
+#define trans_initiator2target_initializer_cb(member, cb) {sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), 0, 0, cb}
-    { sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), 0, 0, cb }
 #define trans_initiator2target_initializer(member) trans_initiator2target_initializer_cb(member, NULL)
 
-#define trans_target2initiator_initializer_cb(member, cb) \
+#define trans_target2initiator_initializer_cb(member, cb) {0, 0, sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), cb}
-    { 0, 0, sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), cb }
 #define trans_target2initiator_initializer(member) trans_target2initiator_initializer_cb(member, NULL)
 
-#define trans_initiator2target_cb(cb) \
+#define trans_initiator2target_cb(cb) {0, 0, 0, 0, cb}
-    { 0, 0, 0, 0, cb }
 
 #define transport_write(id, data, length) transport_execute_transaction(id, data, length, NULL, 0)
 #define transport_read(id, data, length) transport_execute_transaction(id, NULL, 0, data, length)

tests/tap_hold_configurations/retro_tapping/config.h

@@ -20,5 +20,4 @@
 
 #define RETRO_TAPPING
 #define DUMMY_MOD_NEUTRALIZER_KEYCODE KC_RIGHT_CTRL
-#define MODS_TO_NEUTRALIZE \
+#define MODS_TO_NEUTRALIZE {MOD_BIT(KC_LEFT_GUI)}
-    { MOD_BIT(KC_LEFT_GUI) }