some more touchpad stuff

3 files changed, 304 insertions, 0 deletions

diff --git a/halext/include/touchpad.h b/halext/include/touchpad.h
new file mode 100644
index 00000000..bf17edf0
--- /dev/null
+++ b/halext/include/touchpad.h
@@ -0,0 +1,86 @@
+/*
+    ChibiOS-LCD-Driver/RT - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS-LCD-Driver.
+
+    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file	touchpad.h
+ * @brief	TOUCHPAD Touchpad Driver subsystem header file.
+ *
+ * @addgroup TOUCHPAD
+ * @{
+ */
+#ifndef _TOUCHPAD_H
+#define _TOUCHPAD_H
+
+#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
+
+/*===========================================================================*/
+/* Driver constants.                                                         */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Low Level Driver details and error checks.                                */
+/*===========================================================================*/
+
+/* Include the low level driver information */
+#include "touchpad_lld.h"
+
+/*===========================================================================*/
+/* Type definitions                                                          */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* External declarations.                                                    */
+/*===========================================================================*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if TOUCHPAD_NEED_MULTITHREAD
+
+	void tpInit(TOUCHPADDriver *tp);
+	uint16_t tpReadX(void);
+	uint16_t tpReadY(void);
+
+#else
+
+	#define tpInit(tp)		tp_lld_init(tp)
+	#define	tpReadX()		tp_lld_read_x()
+	#define tpReadY()		tp_lld_read_y()
+
+#endif
+
+
+
+#if TOUCHPAD_PRESSURE
+
+	uint16_t tpReadZ(void);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HAL_USE_TOUCHPAD */
+
+#endif /* _TOUCHPAD_H */
+/** @} */
+
diff --git a/halext/include/touchpad_lld.h b/halext/include/touchpad_lld.h
new file mode 100644
index 00000000..e659803c
--- /dev/null
+++ b/halext/include/touchpad_lld.h
@@ -0,0 +1,88 @@
+/*
+    ChibiOS-LCD-Driver/RT - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS-LCD-Driver.
+
+    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file	touchpad_lld.h
+ * @brief	TOUCHPAD Driver subsystem low level driver header.
+ *
+ * @addgroup TOUCHPAD
+ * @{
+ */
+
+#ifndef _TOUCHPAD_LLD_H
+#define _TOUCHPAD_LLD_H
+
+#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
+
+/*===========================================================================*/
+/* Include the low level driver configuration information                    */
+/*===========================================================================*/
+
+#include "gdisp_lld_config.h"
+
+/*===========================================================================*/
+/* Error checks.                                                             */
+/*===========================================================================*/
+
+#ifndef TOUCHPAD_PRESSURE
+	#define TOUCHPAD_PRESSURE	FALSE
+#endif
+
+/*===========================================================================*/
+/* Driver types.                                                             */
+/*===========================================================================*/
+
+/**
+ * @brief	Structure representing a Touchpad driver.
+ */
+struct TOUCHPADDriver {
+	/* ToDo */	
+};
+
+/*===========================================================================*/
+/* External declarations.                                                    */
+/*===========================================================================*/
+
+#if !defined(__DOXYGEN__)
+    extern TOUCHPADDriver Touchpad;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	/* Core functions */
+	void tp_lld_init(void);
+	uint16_t tp_lld_read_x(void);
+	uint16_t tp_lld_read_y(void);
+
+	#if TOUCHPAD_PRESSURE
+	uint16_t tp_lld_read_z(void);
+	#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HAL_USE_TOUCHPAD */
+
+#endif /* _TOUCHPAD_LLD_H */
+/** @} */
+
diff --git a/halext/src/touchpad.c b/halext/src/touchpad.c
new file mode 100644
index 00000000..69d47f42
--- /dev/null
+++ b/halext/src/touchpad.c
@@ -0,0 +1,130 @@
+/*
+    ChibiOS-LCD-Driver - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS-LCD-Driver.
+
+    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file	touchpad.c
+ * @brief	Touchpad Driver code.
+ *
+ * @addgroup TOUCHPAD
+ * @{
+ */
+#include "ch.h"
+#include "hal.h"
+#include "touchpad.h"
+
+#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
+
+#if GDISP_NEED_MULTITHREAD
+    #warning "GDISP: Multithread support not complete"
+    #define MUTEX_INIT      /* Not defined yet */
+    #define MUTEX_ENTER     /* Not defined yet */
+    #define MUTEX_EXIT      /* Not defined yet */
+#endif
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+#ifdef UNUSED
+#elif defined(__GNUC__)
+# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
+#elif defined(__LCLINT__)
+# define UNUSED(x) /*@unused@*/ x
+#else
+# define UNUSED(x) x
+#endif
+
+/*===========================================================================*/
+/* Driver exported variables.                                                */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+#if TOUCHPAD_NEED_MULTITHREAD || defined(__DOXYGEN__)
+    /**
+     * @brief	Touchpad Driver initialization.
+     * @note    This function is NOT currently implicitly invoked by @p halInit().
+     *          It must be called manually.
+     *
+     * @init
+     */
+    void tpInit(TOUCHPADDriver * UNUSED(tp)) {
+        /* Initialise Mutex */
+        MUTEX_INIT
+
+        /* Initialise driver */
+        MUTEX_ENTER
+        tp_lld_init(tp);
+        MUTEX_EXIT
+    }
+#endif
+
+#if TOUCHPAD_NEED_MULTITHREAD || defined(__DOXYGEN__)
+	/**
+	 * @brief	Get the X-Coordinate, relative to screen zero point.
+	 *
+	 * @return	The X position in pixels.
+	 *
+	 * @api
+	 */
+	uint16_t tpReadX(void) {
+		return (tp_lld_read_x());
+	}
+#endif
+
+#if TOUCHPAD_NEED_MULTITHREAD || defined(__DOXYGEN__)
+	/**
+	 * @brief	Get the X-Coordinate, relative to screen zero point.
+	 *
+	 * @return	The Y position in pixels.
+	 *
+	 * @api
+	 */
+	uint16_t tpReadY(void) {
+		return (tp_lld_read_y());
+	}
+#endif
+
+#if TOUCHPAD_NEED_MULTITHREAD || defined(__DOXYGEN__)
+	/**
+	 * @brief	Get the pressure.
+	 *
+	 * @return	The pressure.
+	 *
+	 * @api
+	 */
+	uint16_t tpReadZ(void) {
+		return (tp_lld_read_z());
+	}
+#endif
+
+#endif /* HAL_USE_TOUCHPAD */
+/** @} */
+