diff options
| author | Tectu <joel@unormal.org> | 2012-08-09 01:00:09 +0200 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-08-09 01:00:09 +0200 |
| commit | ed29707da6ba034db1fe7fbf11abe98f530b3647 (patch) | |
| tree | f707ad5224c56da7177ca9595eb1890c4124958e /halext | |
| parent | ebcc53e8e7e124d3e96af95c9f64b4be79cbcae1 (diff) | |
| download | uGFX-ed29707da6ba034db1fe7fbf11abe98f530b3647.tar.gz uGFX-ed29707da6ba034db1fe7fbf11abe98f530b3647.tar.bz2 uGFX-ed29707da6ba034db1fe7fbf11abe98f530b3647.zip | |
fixed a few TOUCHPAD_MULTITHREAD stuffs
Diffstat (limited to 'halext')
| -rw-r--r-- | halext/include/touchpad.h | 15 | ||||
| -rw-r--r-- | halext/include/touchpad_lld.h | 4 | ||||
| -rw-r--r-- | halext/src/touchpad.c | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/halext/include/touchpad.h b/halext/include/touchpad.h index bf17edf0..5991b6ae 100644 --- a/halext/include/touchpad.h +++ b/halext/include/touchpad.h @@ -59,22 +59,27 @@ extern "C" { uint16_t tpReadX(void); uint16_t tpReadY(void); + #if TOUCHPAD_PRESSURE + + uint16_t tpReadZ(void); + + #endif + #else #define tpInit(tp) tp_lld_init(tp) #define tpReadX() tp_lld_read_x() #define tpReadY() tp_lld_read_y() -#endif + #if TOUCHPAD_PRESSURE + #define tpReadZ() tp_lld_read_z() - -#if TOUCHPAD_PRESSURE - - uint16_t tpReadZ(void); + #endif #endif + #ifdef __cplusplus } #endif diff --git a/halext/include/touchpad_lld.h b/halext/include/touchpad_lld.h index e659803c..ccff7d4d 100644 --- a/halext/include/touchpad_lld.h +++ b/halext/include/touchpad_lld.h @@ -35,7 +35,7 @@ /* Include the low level driver configuration information */ /*===========================================================================*/ -#include "gdisp_lld_config.h" +#include "touchpad_lld_config.h" /*===========================================================================*/ /* Error checks. */ @@ -49,6 +49,8 @@ /* Driver types. */ /*===========================================================================*/ +typedef struct TOUCHPADDriver TOUCHPADDriver; + /** * @brief Structure representing a Touchpad driver. */ diff --git a/halext/src/touchpad.c b/halext/src/touchpad.c index 69d47f42..29ff9eb5 100644 --- a/halext/src/touchpad.c +++ b/halext/src/touchpad.c @@ -32,7 +32,7 @@ #if HAL_USE_TOUCHPAD || defined(__DOXYGEN__) #if GDISP_NEED_MULTITHREAD - #warning "GDISP: Multithread support not complete" + #warning "TOUCHPAD: Multithread support not complete" #define MUTEX_INIT /* Not defined yet */ #define MUTEX_ENTER /* Not defined yet */ #define MUTEX_EXIT /* Not defined yet */ |