Various fixes from reorg of files (qmk#14051)

aki27kbd · Aug 17, 2021 · 58cd8c3 · 58cd8c3
1 parent 703f027
commit 58cd8c3
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 35 deletions.
diff --git a/common_features.mk b/common_features.mk
@@ -588,7 +588,7 @@ ifneq ($(filter SOLENOID, $(HAPTIC_ENABLE)), )
 endif
 
 ifeq ($(strip $(HD44780_ENABLE)), yes)
- SRC += drivers/avr/hd44780.c
+ SRC += platforms/avr/drivers/hd44780.c
  OPT_DEFS += -DHD44780_ENABLE
 endif
 

diff --git a/doxygen-todo b/doxygen-todo
@@ -21,7 +21,6 @@ quantum/tools
 quantum/visualizer
 quantum/visualizer/resources
 drivers
-drivers/avr
 drivers/ugfx
 drivers/ugfx/gdisp
 drivers/ugfx/gdisp/is31fl3731c

diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
@@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3733.c \
  quantum/color.c \
- drivers/chibios/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk
@@ -31,4 +31,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3733.c \
  quantum/color.c \
- drivers/chibios/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk
@@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3733.c \
  quantum/color.c \
- drivers/chibios/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/keebwerk/mega/ansi/rules.mk b/keyboards/keebwerk/mega/ansi/rules.mk
@@ -36,4 +36,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3733.c \
  quantum/color.c
-QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c
+QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
@@ -18,7 +18,7 @@
 
 #include QMK_KEYBOARD_H
 #include "tmk_core/common/eeprom.h"
-#include "tmk_core/common/action_layer.h"
+#include "action_layer.h"
 #include "rgblight.h"
 #include "via.h"
 #include "version.h" // for QMK_BUILDDATE used in EEPROM magic

diff --git a/keyboards/nebula12/rules.mk b/keyboards/nebula12/rules.mk
@@ -33,4 +33,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3731.c \
  quantum/color.c
-QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c
+QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/nebula68/rules.mk b/keyboards/nebula68/rules.mk
@@ -35,4 +35,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3733.c \
  quantum/color.c
-QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c
+QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/nk65/rules.mk b/keyboards/nk65/rules.mk
@@ -33,4 +33,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3733.c \
  quantum/color.c \
- drivers/chibios/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/nk87/rules.mk b/keyboards/nk87/rules.mk
@@ -34,4 +34,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  drivers/led/issi/is31fl3733.c \
  quantum/color.c \
- drivers/chibios/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk
@@ -35,4 +35,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk
@@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
@@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
@@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
@@ -44,4 +44,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
@@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
@@ -32,4 +32,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
@@ -41,4 +41,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3218.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/rama_works_u80_a/rules.mk b/keyboards/wilba_tech/rama_works_u80_a/rules.mk
@@ -34,4 +34,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk
@@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
 
 # project specific files
 SRC = drivers/led/issi/is31fl3736.c \
- drivers/avr/i2c_master.c \
+ i2c_master.c \
  quantum/color.c \
  keyboards/wilba_tech/wt_mono_backlight.c \
  keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk
@@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk
@@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk
@@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk
@@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
 
 # project specific files
 SRC = drivers/led/issi/is31fl3736.c \
- drivers/avr/i2c_master.c \
+ i2c_master.c \
  quantum/color.c \
  keyboards/wilba_tech/wt_mono_backlight.c \
  keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk
@@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
 
 # project specific files
 SRC = drivers/led/issi/is31fl3736.c \
- drivers/avr/i2c_master.c \
+ i2c_master.c \
  quantum/color.c \
  keyboards/wilba_tech/wt_mono_backlight.c \
  keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk
@@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
 
 # project specific files
 SRC = drivers/led/issi/is31fl3736.c \
- drivers/avr/i2c_master.c \
+ i2c_master.c \
  quantum/color.c \
  keyboards/wilba_tech/wt_mono_backlight.c \
  keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk
@@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
 
 # project specific files
 SRC = drivers/led/issi/is31fl3736.c \
- drivers/avr/i2c_master.c \
+ i2c_master.c \
  quantum/color.c \
  keyboards/wilba_tech/wt_mono_backlight.c \
  keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk
@@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
 
 # project specific files
 SRC = drivers/led/issi/is31fl3736.c \
- drivers/avr/i2c_master.c \
+ i2c_master.c \
  quantum/color.c \
  keyboards/wilba_tech/wt_mono_backlight.c \
  keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk
@@ -30,7 +30,7 @@ AUDIO_ENABLE = no # Audio output on port C6
 
 # project specific files
 SRC = drivers/led/issi/is31fl3736.c \
- drivers/avr/i2c_master.c \
+ i2c_master.c \
  quantum/color.c \
  keyboards/wilba_tech/wt_mono_backlight.c \
  keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -20,7 +20,7 @@
 #include "wt_rgb_backlight_keycodes.h" // reuse these for now
 
 #include <avr/interrupt.h>
-#include "drivers/avr/i2c_master.h"
+#include "i2c_master.h"
 
 #include "progmem.h"
 #include "quantum/color.h"

diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -54,11 +54,11 @@
 
 #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined (RGB_BACKLIGHT_KW_MEGA)
 #include <avr/interrupt.h>
-#include "drivers/avr/i2c_master.h"
+#include "i2c_master.h"
 #else
 #include <ch.h>
 #include <hal.h>
-#include "drivers/chibios/i2c_master.h"
+#include "i2c_master.h"
 #endif
 
 #if defined(RGB_BACKLIGHT_DAWN60)

diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk
@@ -44,4 +44,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c
diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk
@@ -42,4 +42,4 @@ SRC = keyboards/wilba_tech/wt_main.c \
  keyboards/wilba_tech/wt_rgb_backlight.c \
  quantum/color.c \
  drivers/led/issi/is31fl3731.c \
- drivers/avr/i2c_master.c
+ i2c_master.c