Merge branch 'gdriver' into newmouse

8 files changed, 19 insertions, 19 deletions

diff --git a/boards/base/Embest-STM32-DMSTF4BB/board.mk b/boards/base/Embest-STM32-DMSTF4BB/board.mk
index 3795b43d..9deacc08 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/board.mk
+++ b/boards/base/Embest-STM32-DMSTF4BB/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/SSD2119/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/STMPE811/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/SSD2119/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk
 
diff --git a/boards/base/FireBull-STM32F103-FB/board.mk b/boards/base/FireBull-STM32F103-FB/board.mk
index 8f3e43c0..11714dc7 100644
--- a/boards/base/FireBull-STM32F103-FB/board.mk
+++ b/boards/base/FireBull-STM32F103-FB/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/FireBull-STM32F103-FB/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/ADS7843/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/ADS7843/driver.mk
 
diff --git a/boards/base/Linux/board.mk b/boards/base/Linux/board.mk
index 8c480766..4334c2fc 100644
--- a/boards/base/Linux/board.mk
+++ b/boards/base/Linux/board.mk
@@ -2,5 +2,5 @@ GFXINC  += $(GFXLIB)/boards/base/Linux
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
 
-include $(GFXLIB)/drivers/multiple/X/gdisp_lld.mk
+include $(GFXLIB)/drivers/multiple/X/driver.mk
 
diff --git a/boards/base/Marlin/board.mk b/boards/base/Marlin/board.mk
index 14e8132d..ac3d55f1 100644
--- a/boards/base/Marlin/board.mk
+++ b/boards/base/Marlin/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/Marlin/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/RA8875/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/FT5x06/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/RA8875/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/FT5x06/driver.mk
 
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
index b18bf8f5..0f472bcc 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
-include $(GFXLIB)/drivers/gdisp/ILI9341/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/ILI9341/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
 include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board.mk b/boards/base/Olimex-SAM7EX256-GE12/board.mk
index 2ef53142..ec712c18 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE12/board.mk
@@ -1,8 +1,8 @@
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE12 $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
-include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk
-include $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.mk
-include $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld.mk
-include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/driver.mk
+include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
+include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
+include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk
 include $(GFXLIB)/drivers/gaudio/gadc/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board.mk b/boards/base/Olimex-SAM7EX256-GE8/board.mk
index 98119565..031bbe61 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE8/board.mk
@@ -1,9 +1,9 @@
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
 GFXSRC  +=
 GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
-include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
-include $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.mk
-include $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld.mk
-include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/driver.mk
+include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
+include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
+include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk
 include $(GFXLIB)/drivers/gaudio/gadc/driver.mk
 include $(GFXLIB)/drivers/gaudio/pwm/driver.mk
diff --git a/boards/base/Olimex-STM32-LCD/board.mk b/boards/base/Olimex-STM32-LCD/board.mk
index a1e4b935..2dd9d97a 100644
--- a/boards/base/Olimex-STM32-LCD/board.mk
+++ b/boards/base/Olimex-STM32-LCD/board.mk
@@ -3,6 +3,6 @@ GFXSRC	+=
 GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
 
 include $(GFXLIB)/boards/base/Olimex-STM32-LCD/chibios_board/board.mk
-include $(GFXLIB)/drivers/gdisp/ILI9320/gdisp_lld.mk
-include $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld.mk
+include $(GFXLIB)/drivers/gdisp/ILI9320/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk