Home Explore Help
Register Sign In
HuiJun
/
qmk_firmware
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Relocate platform specific drivers (#13894)

* Relocate platform specific drivers

* Move stm eeprom

* Tidy up slightly
Joel Challis 3 years ago
parent
483691dd73
commit
1bb7af4d44
41 changed files with 5 additions and 5 deletions
Unified View Show Diff Stats
  1. 3 0
      common.mk
  2. 1 0
      common_features.mk
  3. 0 0
      platforms/avr/drivers/analog.c
  4. 0 0
      platforms/avr/drivers/analog.h
  5. 0 0
      platforms/avr/drivers/glcdfont.c
  6. 0 0
      platforms/avr/drivers/hd44780.c
  7. 0 0
      platforms/avr/drivers/hd44780.h
  8. 0 0
      platforms/avr/drivers/i2c_master.c
  9. 0 0
      platforms/avr/drivers/i2c_master.h
  10. 0 0
      platforms/avr/drivers/i2c_slave.c
  11. 0 0
      platforms/avr/drivers/i2c_slave.h
  12. 0 0
      platforms/avr/drivers/serial.c
  13. 0 0
      platforms/avr/drivers/spi_master.c
  14. 0 0
      platforms/avr/drivers/spi_master.h
  15. 0 0
      platforms/avr/drivers/ssd1306.c
  16. 0 0
      platforms/avr/drivers/ssd1306.h
  17. 0 0
      platforms/avr/drivers/uart.c
  18. 0 0
      platforms/avr/drivers/uart.h
  19. 0 0
      platforms/avr/drivers/ws2812.c
  20. 0 0
      platforms/avr/drivers/ws2812_i2c.c
  21. 0 0
      platforms/chibios/drivers/analog.c
  22. 0 0
      platforms/chibios/drivers/analog.h
  23. 0 0
      platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.c
  24. 0 0
      platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
  25. 0 0
      platforms/chibios/drivers/i2c_master.c
  26. 0 0
      platforms/chibios/drivers/i2c_master.h
  27. 0 0
      platforms/chibios/drivers/serial.c
  28. 0 0
      platforms/chibios/drivers/serial_usart.c
  29. 0 0
      platforms/chibios/drivers/serial_usart.h
  30. 0 0
      platforms/chibios/drivers/spi_master.c
  31. 0 0
      platforms/chibios/drivers/spi_master.h
  32. 0 0
      platforms/chibios/drivers/uart.c
  33. 0 0
      platforms/chibios/drivers/uart.h
  34. 0 0
      platforms/chibios/drivers/usbpd_stm32g4.c
  35. 0 0
      platforms/chibios/drivers/ws2812.c
  36. 0 0
      platforms/chibios/drivers/ws2812_pwm.c
  37. 0 0
      platforms/chibios/drivers/ws2812_spi.c
  38. 0 2
      tmk_core/avr.mk
  39. 0 2
      tmk_core/chibios.mk
  40. 1 0
      tmk_core/common.mk
  41. 0 1
      tmk_core/protocol/lufa.mk

+ 3 - 0
common.mk
View File 

@@ -12,6 +12,9 @@ QUANTUM_PATH = $(QUANTUM_DIR)
 
 DRIVER_DIR = drivers
 
 DRIVER_DIR = drivers
 
 DRIVER_PATH = $(DRIVER_DIR)
 
 DRIVER_PATH = $(DRIVER_DIR)
 
 
 
+PLATFORM_DIR = platforms
 
+PLATFORM_PATH = $(PLATFORM_DIR)
 
+
 
 BUILD_DIR := .build
 
 BUILD_DIR := .build
 
 
 
 COMMON_VPATH := $(TOP_DIR)
 
 COMMON_VPATH := $(TOP_DIR)

+ 1 - 0
common_features.mk
View File 

@@ -178,6 +178,7 @@ else
 
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
 
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
 
         OPT_DEFS += -DEEPROM_DRIVER
 
         OPT_DEFS += -DEEPROM_DRIVER
 
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
 
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
 
+        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
 
         SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
 
         SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
 
       else
 
       else
 
         # This will effectively work the same as "transient" if not supported by the chip
 
         # This will effectively work the same as "transient" if not supported by the chip

+ 0 - 0
drivers/avr/analog.c → platforms/avr/drivers/analog.c
View File


+ 0 - 0
drivers/avr/analog.h → platforms/avr/drivers/analog.h
View File


+ 0 - 0
drivers/avr/glcdfont.c → platforms/avr/drivers/glcdfont.c
View File


+ 0 - 0
drivers/avr/hd44780.c → platforms/avr/drivers/hd44780.c
View File


+ 0 - 0
drivers/avr/hd44780.h → platforms/avr/drivers/hd44780.h
View File


+ 0 - 0
drivers/avr/i2c_master.c → platforms/avr/drivers/i2c_master.c
View File


+ 0 - 0
drivers/avr/i2c_master.h → platforms/avr/drivers/i2c_master.h
View File


+ 0 - 0
drivers/avr/i2c_slave.c → platforms/avr/drivers/i2c_slave.c
View File


+ 0 - 0
drivers/avr/i2c_slave.h → platforms/avr/drivers/i2c_slave.h
View File


+ 0 - 0
drivers/avr/serial.c → platforms/avr/drivers/serial.c
View File


+ 0 - 0
drivers/avr/spi_master.c → platforms/avr/drivers/spi_master.c
View File


+ 0 - 0
drivers/avr/spi_master.h → platforms/avr/drivers/spi_master.h
View File


+ 0 - 0
drivers/avr/ssd1306.c → platforms/avr/drivers/ssd1306.c
View File


+ 0 - 0
drivers/avr/ssd1306.h → platforms/avr/drivers/ssd1306.h
View File


+ 0 - 0
drivers/avr/uart.c → platforms/avr/drivers/uart.c
View File


+ 0 - 0
drivers/avr/uart.h → platforms/avr/drivers/uart.h
View File


+ 0 - 0
drivers/avr/ws2812.c → platforms/avr/drivers/ws2812.c
View File


+ 0 - 0
drivers/avr/ws2812_i2c.c → platforms/avr/drivers/ws2812_i2c.c
View File


+ 0 - 0
drivers/chibios/analog.c → platforms/chibios/drivers/analog.c
View File


+ 0 - 0
drivers/chibios/analog.h → platforms/chibios/drivers/analog.h
View File


+ 0 - 0
drivers/eeprom/eeprom_stm32_L0_L1.c → platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.c
View File


+ 0 - 0
drivers/eeprom/eeprom_stm32_L0_L1.h → platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
View File


+ 0 - 0
drivers/chibios/i2c_master.c → platforms/chibios/drivers/i2c_master.c
View File


+ 0 - 0
drivers/chibios/i2c_master.h → platforms/chibios/drivers/i2c_master.h
View File


+ 0 - 0
drivers/chibios/serial.c → platforms/chibios/drivers/serial.c
View File


+ 0 - 0
drivers/chibios/serial_usart.c → platforms/chibios/drivers/serial_usart.c
View File


+ 0 - 0
drivers/chibios/serial_usart.h → platforms/chibios/drivers/serial_usart.h
View File


+ 0 - 0
drivers/chibios/spi_master.c → platforms/chibios/drivers/spi_master.c
View File


+ 0 - 0
drivers/chibios/spi_master.h → platforms/chibios/drivers/spi_master.h
View File


+ 0 - 0
drivers/chibios/uart.c → platforms/chibios/drivers/uart.c
View File


+ 0 - 0
drivers/chibios/uart.h → platforms/chibios/drivers/uart.h
View File


+ 0 - 0
drivers/chibios/usbpd_stm32g4.c → platforms/chibios/drivers/usbpd_stm32g4.c
View File


+ 0 - 0
drivers/chibios/ws2812.c → platforms/chibios/drivers/ws2812.c
View File


+ 0 - 0
drivers/chibios/ws2812_pwm.c → platforms/chibios/drivers/ws2812_pwm.c
View File


+ 0 - 0
drivers/chibios/ws2812_spi.c → platforms/chibios/drivers/ws2812_spi.c
View File


+ 0 - 2
tmk_core/avr.mk
View File 

@@ -12,8 +12,6 @@ HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
 
 EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
 
 EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
 
 BIN =
 
 BIN =
 
 
 
-COMMON_VPATH += $(DRIVER_PATH)/avr
 
-
 
 COMPILEFLAGS += -funsigned-char
 
 COMPILEFLAGS += -funsigned-char
 
 COMPILEFLAGS += -funsigned-bitfields
 
 COMPILEFLAGS += -funsigned-bitfields
 
 COMPILEFLAGS += -ffunction-sections
 
 COMPILEFLAGS += -ffunction-sections

+ 0 - 2
tmk_core/chibios.mk
View File 

@@ -278,8 +278,6 @@ HEX = $(OBJCOPY) -O $(FORMAT)
 
 EEP =
 
 EEP =
 
 BIN = $(OBJCOPY) -O binary
 
 BIN = $(OBJCOPY) -O binary
 
 
 
-COMMON_VPATH += $(DRIVER_PATH)/chibios
 
-
 
 THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB
 
 THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB
 
 
 
 COMPILEFLAGS += -fomit-frame-pointer
 
 COMPILEFLAGS += -fomit-frame-pointer

+ 1 - 0
tmk_core/common.mk
View File 

@@ -138,3 +138,4 @@ endif
 
 # Search Path
 
 # Search Path
 
 VPATH += $(TMK_PATH)/$(COMMON_DIR)
 
 VPATH += $(TMK_PATH)/$(COMMON_DIR)
 
 VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR)
 
 VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR)
 
+VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)

+ 0 - 1
tmk_core/protocol/lufa.mk
View File 

@@ -49,7 +49,6 @@ SRC += $(LUFA_DIR)/usb_util.c
 
 # Search Path
 
 # Search Path
 
 VPATH += $(TMK_PATH)/$(LUFA_DIR)
 
 VPATH += $(TMK_PATH)/$(LUFA_DIR)
 
 VPATH += $(LUFA_PATH)
 
 VPATH += $(LUFA_PATH)
 
-VPATH += $(DRIVER_PATH)/avr
 
 
 
 # Option modules
 
 # Option modules
 
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
 
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)