diff options
| author | Jesper Jensen <DelusionalLogic@users.noreply.github.com> | 2020-12-06 07:24:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 17:24:49 +1100 |
| commit | 63d06655e65a4399d4d1213f38cff80e3f23a8cd (patch) | |
| tree | b0294394479c660673a72625da0744ce7b792d3e /keyboards/massdrop/alt/keymaps | |
| parent | 7043561459942c7cba8fef8547145196a8d03398 (diff) | |
gcc 10 compatibility for Drop alt (#9485)
* Split dmac_desc declaration and definition
According to the official documentation[1] gcc 10 is more strict about
correct extern usage.
I've had to move the definition of dmac_desc and dmac_desc_wb from
i2c_master.h to the corresponding .c file. This could be an issue if
anyone includes the i2c_master.h file without liking with the object
file.
[1]: https://gcc.gnu.org/gcc-10/porting_to.html
* Remove the keymap_config definition from keymaps
The keymap_config def was conflicting with the one found in
tmk_core/common/magic.c. Declaring it extern in magic.c breaks a bunch
of keyboard that rely on that declaration (like the ergodox). Instead
I've removed the one found in the keymap.c of the massdrop alt.
The same change will have to be made to other keyboards.
Diffstat (limited to 'keyboards/massdrop/alt/keymaps')
4 files changed, 0 insertions, 8 deletions
diff --git a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c index f6f79ad91e..a08123b0f5 100644 --- a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c +++ b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c @@ -12,8 +12,6 @@ enum alt_keycodes { #define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode -keymap_config_t keymap_config; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \ diff --git a/keyboards/massdrop/alt/keymaps/bonta/keymap.c b/keyboards/massdrop/alt/keymaps/bonta/keymap.c index c1acf2c151..9ac27f57e3 100644 --- a/keyboards/massdrop/alt/keymaps/bonta/keymap.c +++ b/keyboards/massdrop/alt/keymaps/bonta/keymap.c @@ -14,8 +14,6 @@ enum alt_keycodes { #define RGB_BRU RGB_VAI #define RGB_BRD RGB_VAD -keymap_config_t keymap_config; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \ diff --git a/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c b/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c index 873d18449b..4c079a6aaf 100644 --- a/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c +++ b/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c @@ -28,8 +28,6 @@ enum alt_keycodes { // //TODO tap/toggle for layers -keymap_config_t keymap_config; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_SPOT, diff --git a/keyboards/massdrop/alt/keymaps/reywood/keymap.c b/keyboards/massdrop/alt/keymaps/reywood/keymap.c index cf60acfe66..6279b509b4 100644 --- a/keyboards/massdrop/alt/keymaps/reywood/keymap.c +++ b/keyboards/massdrop/alt/keymaps/reywood/keymap.c @@ -26,8 +26,6 @@ enum alt_keycodes { #define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode #define ______ KC_TRNS -keymap_config_t keymap_config; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \ |