From cf3b8e4ed25d74d03cc6e246fe0f4ee129b17bc1 Mon Sep 17 00:00:00 2001 From: inmarket Date: Mon, 13 Oct 2014 16:37:04 +1000 Subject: Add GMouse parameter to ADS7843 mouse driver to enable multiple drivers. Tidy up naming. --- .../gmouse_lld_ADS7843_board.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'boards/base') diff --git a/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h b/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h index e4f30818..b202dd85 100644 --- a/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h +++ b/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h @@ -8,6 +8,7 @@ #ifndef _GINPUT_LLD_MOUSE_BOARD_H #define _GINPUT_LLD_MOUSE_BOARD_H +// Resolution and Accuracy Settings #define GMOUSE_ADS7843_PEN_CALIBRATE_ERROR 2 #define GMOUSE_ADS7843_PEN_CLICK_ERROR 2 #define GMOUSE_ADS7843_PEN_MOVE_ERROR 2 @@ -15,6 +16,9 @@ #define GMOUSE_ADS7843_FINGER_CLICK_ERROR 4 #define GMOUSE_ADS7843_FINGER_MOVE_ERROR 4 +// How much extra data to allocate at the end of the GMouse structure for the board's use +#define GMOUSE_ADS7843_BOARD_DATA_SIZE 0 + static const SPIConfig spicfg = { 0, GPIOC, @@ -39,28 +43,35 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) return TRUE; } -static inline bool_t getpin_pressed(void) -{ +static inline bool_t getpin_pressed(GMouse* m) +{ + (void) m; + return (!palReadPad(GPIOC, 4)); } -static inline void aquire_bus(void) +static inline void aquire_bus(GMouse* m) { + (void) m; + spiAcquireBus(&SPID1); palClearPad(GPIOC, 6); } -static inline void release_bus(void) +static inline void release_bus(GMouse* m) { + (void) m; + palSetPad(GPIOC, 6); spiReleaseBus(&SPID1); } -static inline uint16_t read_value(uint16_t port) +static inline uint16_t read_value(GMouse* m, uint16_t port) { static uint8_t txbuf[3] = {0}; static uint8_t rxbuf[3] = {0}; uint16_t ret; + (void) m; txbuf[0] = port; -- cgit v1.2.3