restructure

12 files changed, 23 insertions, 16 deletions

diff --git a/drivers/drivers.mk b/drivers/drivers.mk
new file mode 100644
index 00000000..e5b3f34c
--- /dev/null
+++ b/drivers/drivers.mk
@@ -0,0 +1,7 @@
+LCD_DRIVERS_SRC	=	$(LCDLIB)/drivers/lcd/ssd1289_lld.c \
+					$(LCDLIB)/drivers/lcd/s6d1121_lld.c \
+					$(LCDLIB)/drivers/touchpad/ads7843_lld.c \
+					$(LCDLIB)/drivers/touchpad/xpt2046_lld.c \
+
+LCD_DRIVERS_INC =	$(LCDLIB)/drivers/lcd \
+					$(LCDLIB)/drivers/touchpad \
diff --git a/drivers/s6d1121_lld.c b/drivers/lcd/s6d1121_lld.c
index dfadc19d..dfadc19d 100644
--- a/drivers/s6d1121_lld.c
+++ b/drivers/lcd/s6d1121_lld.c
diff --git a/drivers/s6d1121_lld.h b/drivers/lcd/s6d1121_lld.h
index 173f6e40..173f6e40 100644
--- a/drivers/s6d1121_lld.h
+++ b/drivers/lcd/s6d1121_lld.h
diff --git a/drivers/ssd1289_lld.c b/drivers/lcd/ssd1289_lld.c
index 12782e31..12782e31 100644
--- a/drivers/ssd1289_lld.c
+++ b/drivers/lcd/ssd1289_lld.c
diff --git a/drivers/ssd1289_lld.h b/drivers/lcd/ssd1289_lld.h
index 1a98356e..1a98356e 100644
--- a/drivers/ssd1289_lld.h
+++ b/drivers/lcd/ssd1289_lld.h
diff --git a/drivers/ads7843_lld.c b/drivers/touchpad/ads7843_lld.c
index 76e11123..76e11123 100644
--- a/drivers/ads7843_lld.c
+++ b/drivers/touchpad/ads7843_lld.c
diff --git a/drivers/ads7843_lld.h b/drivers/touchpad/ads7843_lld.h
index 388aacc8..388aacc8 100644
--- a/drivers/ads7843_lld.h
+++ b/drivers/touchpad/ads7843_lld.h
diff --git a/drivers/xpt2046_lld.c b/drivers/touchpad/xpt2046_lld.c
index 731ff8c5..731ff8c5 100644
--- a/drivers/xpt2046_lld.c
+++ b/drivers/touchpad/xpt2046_lld.c
diff --git a/drivers/xpt2046_lld.h b/drivers/touchpad/xpt2046_lld.h
index ed7a0d09..ed7a0d09 100644
--- a/drivers/xpt2046_lld.h
+++ b/drivers/touchpad/xpt2046_lld.h
diff --git a/glcd.h b/glcd.h
index 75c47457..cb9d5b45 100644
--- a/glcd.h
+++ b/glcd.h
@@ -4,8 +4,8 @@
 #include "ch.h"
 #include "hal.h"
 #include "fonts.h"
-#include "drivers/ssd1289_lld.h"
-#include "drivers/s6d1121_lld.h"
+#include "drivers/lcd/ssd1289_lld.h"
+#include "drivers/lcd/s6d1121_lld.h"
 
 #define SCREEN_WIDTH    240
 #define SCREEN_HEIGHT   320
diff --git a/lcd.mk b/lcd.mk
index 030c4398..1c54d5e9 100644
--- a/lcd.mk
+++ b/lcd.mk
@@ -1,13 +1,13 @@
-# LCD files.
-LCDSRC = 	${CHIBIOS}/ext/lcd/glcd.c \
-			${CHIBIOS}/ext/lcd/fonts.c \
-			${CHIBIOS}/ext/lcd/touchpad.c \
-			${CHIBIOS}/ext/lcd/graph.c \
-			${CHIBIOS}/ext/lcd/gui.c \
-			${CHIBIOS}/ext/lcd/drivers/ssd1289_lld.c \
-			${CHIBIOS}/ext/lcd/drivers/s6d1121_lld.c \
-			${CHIBIOS}/ext/lcd/drivers/ads7843_lld.c \
-			${CHIBIOS}/ext/lcd/drivers/xpt2046_lld.c \
+LCDLIB =	$(CHIBIOS)/ext/lcd
 
-LCDINC = 	${CHIBIOS}/ext/lcd \
-			${CHIBIOS}/etc/lcd/drivers
+include 	$(LCDLIB)/drivers/drivers.mk
+
+LCDSRC = 	$(LCDLIB)/glcd.c \
+			$(LCDLIB)/fonts.c \
+			$(LCDLIB)/touchpad.c \
+			$(LCDLIB)/graph.c \
+			$(LCDLIB)/gui.c \
+			$(LCD_DRIVERS_SRC)
+
+LCDINC = 	$(LCDLIB) \
+			$(LCD_DRIVERS_INC)
diff --git a/touchpad.h b/touchpad.h
index c0d736bc..dd2d7f14 100644
--- a/touchpad.h
+++ b/touchpad.h
@@ -4,8 +4,8 @@
 #include "ch.h"
 #include "hal.h"
 #include "glcd.h"
-#include "drivers/ads7843_lld.h"
-#include "drivers/xpt2046_lld.h"
+#include "drivers/touchpad/ads7843_lld.h"
+#include "drivers/touchpad/xpt2046_lld.h"
 
 #define CONVERSIONS 3