diff options
| author | Tectu <joel@unormal.org> | 2012-07-22 22:21:19 +0200 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-07-22 22:21:19 +0200 |
| commit | 952b0b69e8f8de054e133c7ddca6e9bcd744feaf (patch) | |
| tree | 634cee5898f6be2cfbfb4a34bd592999ad00f28b /drivers/touchpad | |
| parent | 637b0b7d5dfb4a8fc6a4e2da068b04474f2b3d0c (diff) | |
| download | uGFX-952b0b69e8f8de054e133c7ddca6e9bcd744feaf.tar.gz uGFX-952b0b69e8f8de054e133c7ddca6e9bcd744feaf.tar.bz2 uGFX-952b0b69e8f8de054e133c7ddca6e9bcd744feaf.zip | |
touchpad fix
Diffstat (limited to 'drivers/touchpad')
| -rw-r--r-- | drivers/touchpad/ads7843_lld.c | 6 | ||||
| -rw-r--r-- | drivers/touchpad/ads7843_lld.h | 6 | ||||
| -rw-r--r-- | drivers/touchpad/xpt2046_lld.c | 6 | ||||
| -rw-r--r-- | drivers/touchpad/xpt2046_lld.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/touchpad/ads7843_lld.c b/drivers/touchpad/ads7843_lld.c index 507a2104..b097e0a5 100644 --- a/drivers/touchpad/ads7843_lld.c +++ b/drivers/touchpad/ads7843_lld.c @@ -2,7 +2,7 @@ #ifdef TOUCHPAD_USE_ADS7843 -__inline uint16_t lld_readX(void) { +__inline uint16_t lld_tpReadX(void) { uint8_t txbuf[1]; uint8_t rxbuf[2]; uint16_t x; @@ -19,7 +19,7 @@ __inline uint16_t lld_readX(void) { return x; } -__inline uint16_t lld_readY(void) { +__inline uint16_t lld_tpReadY(void) { uint8_t txbuf[1]; uint8_t rxbuf[2]; uint16_t y; @@ -36,7 +36,7 @@ __inline uint16_t lld_readY(void) { return y; } -__inline uint16_t lld_readZ(void) { +__inline uint16_t lld_tpReadZ(void) { return 0; } diff --git a/drivers/touchpad/ads7843_lld.h b/drivers/touchpad/ads7843_lld.h index 121e6288..d288c3ea 100644 --- a/drivers/touchpad/ads7843_lld.h +++ b/drivers/touchpad/ads7843_lld.h @@ -6,9 +6,9 @@ #ifdef TOUCHPAD_USE_ADS7843 -uint16_t lld_readX(void); -uint16_t lld_readY(void); -uint16_t lld_readZ(void); +uint16_t lld_tpReadX(void); +uint16_t lld_tpReadY(void); +uint16_t lld_tpReadZ(void); #endif #endif diff --git a/drivers/touchpad/xpt2046_lld.c b/drivers/touchpad/xpt2046_lld.c index 02ded390..eac9d19a 100644 --- a/drivers/touchpad/xpt2046_lld.c +++ b/drivers/touchpad/xpt2046_lld.c @@ -2,7 +2,7 @@ #ifdef TOUCHPAD_USE_XPT2046 -__inline uint16_t lld_readX(void) { +__inline uint16_t lld_tpReadX(void) { uint8_t txbuf[1]; uint8_t rxbuf[2]; uint16_t x; @@ -19,7 +19,7 @@ __inline uint16_t lld_readX(void) { return x; } -__inline uint16_t lld_readY(void) { +__inline uint16_t lld_tpReadY(void) { uint8_t txbuf[1]; uint8_t rxbuf[2]; uint16_t y; @@ -36,7 +36,7 @@ __inline uint16_t lld_readY(void) { return y; } -__inline uint16_t lld_readZ(void) { +__inline uint16_t lld_tpReadZ(void) { return 0; } diff --git a/drivers/touchpad/xpt2046_lld.h b/drivers/touchpad/xpt2046_lld.h index c3a12077..249c66ca 100644 --- a/drivers/touchpad/xpt2046_lld.h +++ b/drivers/touchpad/xpt2046_lld.h @@ -6,9 +6,9 @@ #ifdef TOUCHPAD_USE_XPT2046 -uint16_t lld_readX(void); -uint16_t lld_readY(void); -uint16_t lld_readZ(void); +uint16_t lld_tpReadX(void); +uint16_t lld_tpReadY(void); +uint16_t lld_tpReadZ(void); #endif #endif |