From 308184ead1c6071a739c7a233287a4c0412ca817 Mon Sep 17 00:00:00 2001
From: Tectu <joel@unormal.org>
Date: Thu, 9 Aug 2012 00:43:52 +0200
Subject: [PATCH] some more touchpad stuff

---
 .../touchpad/touchpadXPT2046/touchpad_lld.c       | 15 +++++++++------
 .../touchpadXPT2046/touchpad_lld_config.h         |  2 +-
 halext/halext.mk                                  |  3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c b/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c
index f3211633..2f280169 100644
--- a/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c
+++ b/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c
@@ -50,7 +50,7 @@
 /*===========================================================================*/
 
 #if !defined(__DOXYGEN__)
-	TOUCHPADDriver TOUCHPAD;
+	TOUCHPADDriver Touchpad;
 #endif
 
 /*===========================================================================*/
@@ -72,12 +72,15 @@
 /* ---- Required Routines ---- */
 
 /**
- * @brief   Low level GDISP driver initialization.
+ * @brief   Low level Touchpad driver initialization.
  *
  * @notapi
  */
-void touchpad_lld_init(void) {
+void tp_lld_init(TOUCHPADDriver *tp) {
 	/* Initialise the TOUCHPAD structure */
+
+	/* ToDo */
+	(void)tp;
 }
 
 /**
@@ -85,7 +88,7 @@ void touchpad_lld_init(void) {
  *
  * @notapi
  */
-uint16_t touchpad_lld_read_x(void) {
+uint16_t tp_lld_read_x(void) {
 	/* ToDo */
 	return 0;
 }
@@ -95,7 +98,7 @@ uint16_t touchpad_lld_read_x(void) {
  *
  * @notapi
  */
-uint16_t touchpad_lld_read_y(void) {
+uint16_t tp_lld_read_y(void) {
 	/* ToDo */
 	return 0;
 }
@@ -107,7 +110,7 @@ uint16_t touchpad_lld_read_y(void) {
 	 *
 	 * @notapi
 	 */
-	uint16_t toucpad_lld_read_y(void) {
+	uint16_t tp_lld_read_y(void) {
 		/* ToDo */
 		return 0;
 	}
diff --git a/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld_config.h b/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld_config.h
index 6c491e27..52493836 100644
--- a/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld_config.h
+++ b/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld_config.h
@@ -35,7 +35,7 @@
 /* Driver hardware support.                                                  */
 /*===========================================================================*/
 
-#define TOUCHPAD_PRESSURE_DIRECTION			TRUE
+#define TOUCHPAD_PRESSURE			TRUE
 
 #endif	/* HAL_USE_TOUCHPAD */
 
diff --git a/halext/halext.mk b/halext/halext.mk
index 5afb24b0..80ddf666 100644
--- a/halext/halext.mk
+++ b/halext/halext.mk
@@ -3,7 +3,8 @@
 
 HALSRC +=	$(LCDLIB)/halext/src/gdisp.c \
 			$(LCDLIB)/halext/src/gdisp_fonts.c \
-			$(LCDLIB)/halext/src/gdisp_emulation.c
+			$(LCDLIB)/halext/src/gdisp_emulation.c \
+			$(LCDLIB)/halext/src/touchpad.c
 
 # Required include directories
 HALINC +=	$(LCDLIB)/halext/include