Start mvoing hardware drivers to /drivers/ (qmk#1433)

* start driver isolation * update nyquist and orthodox boards * update atreus62 * move drivers to avr * update avr conditional
sgurenkov · Jul 10, 2017 · 42d5a32 · 42d5a32
1 parent 8d190d5
commit 42d5a32
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 1,582 deletions.
diff --git a/common.mk b/common.mk
@@ -9,6 +9,9 @@ LIB_PATH = $(TOP_DIR)/lib
 QUANTUM_DIR = quantum
 QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR)
 
+DRIVER_DIR = drivers
+DRIVER_PATH = $(TOP_DIR)/$(DRIVER_DIR)
+
 BUILD_DIR := $(TOP_DIR)/.build
 
 COMMON_VPATH := $(TOP_DIR)
@@ -17,4 +20,5 @@ COMMON_VPATH += $(QUANTUM_PATH)
 COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
 COMMON_VPATH += $(QUANTUM_PATH)/audio
 COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
-COMMON_VPATH += $(QUANTUM_PATH)/api
+COMMON_VPATH += $(QUANTUM_PATH)/api
+COMMON_VPATH += $(DRIVER_PATH)
diff --git a/common_features.mk b/common_features.mk
@@ -87,7 +87,7 @@ endif
 
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
  OPT_DEFS += -DRGBLIGHT_ENABLE
- SRC += $(QUANTUM_DIR)/light_ws2812.c
+ SRC += ws2812.c
  SRC += $(QUANTUM_DIR)/rgblight.c
  CIE1931_CURVE = yes
  LED_BREATHING_TABLE = yes

diff --git a/quantum/analog.c → drivers/avr/analog.c b/quantum/analog.c → drivers/avr/analog.c
diff --git a/quantum/analog.h → drivers/avr/analog.h b/quantum/analog.h → drivers/avr/analog.h
diff --git a/keyboards/lets_split/common/glcdfont.c → drivers/avr/glcdfont.c b/keyboards/lets_split/common/glcdfont.c → drivers/avr/glcdfont.c
diff --git a/keyboards/atreus62/pro_micro.h → drivers/avr/pro_micro.h b/keyboards/atreus62/pro_micro.h → drivers/avr/pro_micro.h
diff --git a/keyboards/orthodox/ssd1306.c → drivers/avr/ssd1306.c b/keyboards/orthodox/ssd1306.c → drivers/avr/ssd1306.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include "print.h"
 #include "lets_split.h"
-#include "common/glcdfont.c"
+#include "glcdfont.c"
 #ifdef ADAFRUIT_BLE_ENABLE
 #include "adafruit_ble.h"
 #endif

diff --git a/keyboards/lets_split/ssd1306.h → drivers/avr/ssd1306.h b/keyboards/lets_split/ssd1306.h → drivers/avr/ssd1306.h
diff --git a/quantum/light_ws2812.c → drivers/avr/ws2812.c b/quantum/light_ws2812.c → drivers/avr/ws2812.c
@@ -21,7 +21,7 @@
 * along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "light_ws2812.h"
+#include "ws2812.h"
 #include <avr/interrupt.h>
 #include <avr/io.h>
 #include <util/delay.h>

diff --git a/quantum/light_ws2812.h → drivers/avr/ws2812.h b/quantum/light_ws2812.h → drivers/avr/ws2812.h
diff --git a/keyboards/handwired/promethium/rgbsps.c b/keyboards/handwired/promethium/rgbsps.c
@@ -1,4 +1,4 @@
-#include "light_ws2812.h"
+#include "ws2812.h"
 #include "rgbsps.h"
 
 struct cRGB led[RGBSPS_NUM];

diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
@@ -72,7 +72,7 @@ BLUETOOTH = AdafruitBLE
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
 
-SRC += $(QUANTUM_DIR)/light_ws2812.c
+SRC += ws2812.c
 SRC += rgbsps.c
-SRC += $(QUANTUM_DIR)/analog.c
+SRC += analog.c
 SRC += matrix.c