From 41271d632b74f5cf47c30d3b699eb6b2786f2136 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 23 Jun 2018 13:02:07 +1000 Subject: Added new type definitions - moving towards V3.0 --- drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c | 4 ++-- .../touch/ADS7843/gmouse_lld_ADS7843_board_template.h | 4 ++-- drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c | 12 ++++++------ .../touch/EXC7200/gmouse_lld_EXC7200_board_template.h | 2 +- drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c | 12 ++++++------ .../touch/FT5336/gmouse_lld_FT5336_board_template.h | 4 ++-- drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c | 10 +++++----- .../touch/FT5x06/gmouse_lld_FT5x06_board_template.h | 2 +- drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c | 10 +++++----- .../touch/FT6x06/gmouse_lld_FT6x06_board_template.h | 2 +- .../ginput/touch/Linux-Event/gmouse_lld_linux_event.c | 10 +++++----- drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c | 16 ++++++++-------- .../MAX11802/gmouse_lld_MAX11802_board_template.h | 4 ++-- .../ginput/touch/MCU/gmouse_lld_MCU_board_template.h | 4 ++-- drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c | 8 ++++---- drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c | 18 +++++++++--------- .../STMPE610/gmouse_lld_STMPE610_board_template.h | 4 ++-- drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c | 18 +++++++++--------- .../STMPE811/gmouse_lld_STMPE811_board_template.h | 4 ++-- 19 files changed, 74 insertions(+), 74 deletions(-) (limited to 'drivers/ginput') diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c index d5412ad2..fb5e4aec 100644 --- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c +++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c @@ -19,7 +19,7 @@ #define CMD_Y 0x91 #define CMD_ENABLE_IRQ 0x80 -static bool_t MouseXYZ(GMouse* m, GMouseReading* pdr) +static gBool MouseXYZ(GMouse* m, GMouseReading* pdr) { (void)m; @@ -42,7 +42,7 @@ static bool_t MouseXYZ(GMouse* m, GMouseReading* pdr) release_bus(m); } - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h index fcfb1f7a..533b5cb6 100644 --- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h +++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h @@ -19,11 +19,11 @@ // 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 bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } -static GFXINLINE bool_t getpin_pressed(GMouse* m) { +static GFXINLINE gBool getpin_pressed(GMouse* m) { } diff --git a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c index ebe1d9c8..7bd82e36 100644 --- a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c +++ b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c @@ -17,16 +17,16 @@ #define EXC7200_READ_CMD 0x09 -static bool_t MouseInit(GMouse* m, unsigned driverinstance) +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) { - return FALSE; + return gFalse; } - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { uint8_t rxbuf[10]; @@ -35,7 +35,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) // Read if (!read_bytes(m, EXC7200_READ_CMD, rxbuf, 10)) { - return FALSE; + return gFalse; } // Check if touched @@ -47,7 +47,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) pdr->z = 0; } - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h index 16588a8a..9a2556d3 100644 --- a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h +++ b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h @@ -19,7 +19,7 @@ // How much extra data to allocate at the end of the GMouse structure for the board's use #define GMOUSE_EXC7200_BOARD_DATA_SIZE 0 -static bool_t init_board(GMouse* m, unsigned driverinstance) +static gBool init_board(GMouse* m, unsigned driverinstance) { } diff --git a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c index a55bef65..082c372a 100644 --- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c +++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c @@ -18,11 +18,11 @@ // Hardware definitions #include "drivers/ginput/touch/FT5336/ft5336.h" -static bool_t ft5336Init(GMouse* m, unsigned driverinstance) +static gBool ft5336Init(GMouse* m, unsigned driverinstance) { // Initialize the board stuff if (!init_board(m, driverinstance)) { - return FALSE; + return gFalse; } // We need at least 200 ms worth of delay here... @@ -30,7 +30,7 @@ static bool_t ft5336Init(GMouse* m, unsigned driverinstance) // Check Chip ID if (read_byte(m, FT5336_CHIP_ID_REG) != FT5336_ID_VALUE) { - return FALSE; + return gFalse; } // Disable interrupts. We use this chip in polling mode @@ -53,10 +53,10 @@ static bool_t ft5336Init(GMouse* m, unsigned driverinstance) // Timer to enter 'idle' when in 'Monitor' (ms) write_reg(m, FT5336_PERIODMONITOR_REG, 0x28); */ - return TRUE; + return gTrue; } -static bool_t ft5336ReadXYZ(GMouse* m, GMouseReading* pdr) +static gBool ft5336ReadXYZ(GMouse* m, GMouseReading* pdr) { // Assume not touched. pdr->buttons = 0; @@ -70,7 +70,7 @@ static bool_t ft5336ReadXYZ(GMouse* m, GMouseReading* pdr) pdr->z = 1; } - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h index fb3a8b52..45331b25 100644 --- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h +++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h @@ -25,12 +25,12 @@ // It requires the active area of the touch panel to exactly match the display size. #define GMOUSE_FT5336_SELF_CALIBRATE GFXOFF -static bool_t init_board(GMouse* m, unsigned instance) +static gBool init_board(GMouse* m, unsigned instance) { (void)m; (void)instance; - return TRUE; + return gTrue; } static void write_reg(GMouse* m, uint8_t reg, uint8_t val) diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c index dbd5981c..50fa36a0 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c @@ -18,9 +18,9 @@ // Hardware definitions #include "ft5x06.h" -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -53,10 +53,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, FT5x06_ID_G_PERIODMONITOR, 0x28); release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { // Assume not touched. pdr->buttons = 0; @@ -96,7 +96,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) } release_bus(m); - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h index 728fa695..ded7cfb9 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h @@ -25,7 +25,7 @@ // It requires the active area of the touch panel to exactly match the display size. #define GMOUSE_FT5x06_SELF_CALIBRATE GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } static GFXINLINE void aquire_bus(GMouse* m) { diff --git a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c index 0fc21d18..5f3902b3 100644 --- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c +++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c @@ -18,9 +18,9 @@ // Hardware definitions #include "ft6x06.h" -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -53,10 +53,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, FT6x06_ID_G_PERIODMONITOR, 0x28); release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { // Assume not touched. pdr->buttons = 0; @@ -96,7 +96,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) } release_bus(m); - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h index 85b54652..3f2c63d2 100644 --- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h +++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h @@ -25,7 +25,7 @@ // It requires the active area of the touch panel to exactly match the display size. #define GMOUSE_FT6x06_SELF_CALIBRATE GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } static GFXINLINE void aquire_bus(GMouse* m) { diff --git a/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c b/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c index e1989e03..d1aad3ba 100644 --- a/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c +++ b/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c @@ -31,7 +31,7 @@ typedef struct privStruct { GMouseReading lastReading; } privStruct; -static bool_t _init(GMouse* m, unsigned driverInstance) +static gBool _init(GMouse* m, unsigned driverInstance) { (void)driverInstance; @@ -42,7 +42,7 @@ static bool_t _init(GMouse* m, unsigned driverInstance) priv->fd = open(GMOUSE_LINUX_EVENT_DEVICE, O_RDONLY | O_NONBLOCK); if (priv->fd < 0) { fprintf(stderr, "GINPUT Mouse: Cannot open input device (%s)\n", GMOUSE_LINUX_EVENT_DEVICE); - return FALSE; + return gFalse; } // Initialize @@ -51,10 +51,10 @@ static bool_t _init(GMouse* m, unsigned driverInstance) priv->lastReading.y = 0; priv->lastReading.z = 0; - return TRUE; + return gTrue; } -static bool_t _read(GMouse* m, GMouseReading* pdr) +static gBool _read(GMouse* m, GMouseReading* pdr) { int i; int rb; @@ -97,7 +97,7 @@ static bool_t _read(GMouse* m, GMouseReading* pdr) priv->lastReading.z = pdr->z; priv->lastReading.buttons = pdr->buttons; - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c index 8976cceb..f2222898 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c @@ -27,7 +27,7 @@ #define Z_MIN 0 #define Z_MAX 1 -static bool_t MouseInit(GMouse* m, unsigned driverinstance) +static gBool MouseInit(GMouse* m, unsigned driverinstance) { const uint8_t *p; @@ -46,7 +46,7 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) }; if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); for (p = commandList; p < commandList+sizeof(commandList); p += 2) @@ -60,15 +60,15 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) aquire_bus(m); if (write_command(m, MAX11802_CMD_MODE_RD, 0) != MAX11802_MODE) { release_bus(m); - return FALSE; + return gFalse; } release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { uint8_t readyCount; uint8_t notReadyCount; @@ -126,7 +126,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) // Has it been too long? If so give up if (++notReadyCount >= 5) { - return FALSE; + return gFalse; } // Give up the time slice to someone else and then try again @@ -149,7 +149,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) // Was there a valid touch? if (((pdr->x | pdr->y) & 0x03) != 0x0) { pdr->z = Z_MIN; - return TRUE; + return gTrue; } // Strip the tags (we need to take care because coord_t is signed - and sign bit gets extended on shift!) @@ -157,7 +157,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) pdr->y = (uint16_t)(pdr->y) >> 4; pdr->z = Z_MAX; - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h index e5339815..cf663cb0 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h @@ -22,9 +22,9 @@ /** * Init the board * - * Returns TRUE on success, FALSE on failure + * Returns gTrue on success, gFalse on failure */ -static GFXINLINE bool_t init_board(GMouse* m, unsigned driverinstance) { +static GFXINLINE gBool init_board(GMouse* m, unsigned driverinstance) { } diff --git a/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h b/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h index 440d81fe..bc2917ad 100644 --- a/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h +++ b/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h @@ -23,10 +23,10 @@ // How much extra data to allocate at the end of the GMouse structure for the board's use #define GMOUSE_MCU_BOARD_DATA_SIZE 0 -static bool_t init_board(GMouse *m, unsigned driverinstance) { +static gBool init_board(GMouse *m, unsigned driverinstance) { } -static bool_t read_xyz(GMouse *m, GMouseReading *prd) { +static gBool read_xyz(GMouse *m, GMouseReading *prd) { } #endif /* _LLD_GMOUSE_MCU_BOARD_H */ diff --git a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c index d79da2a2..53b167bb 100644 --- a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c +++ b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c @@ -19,16 +19,16 @@ coord_t qwidgetMouseY; coord_t qwidgetMouseZ; uint16_t qwidgetMouseButtons; -static bool_t _init(GMouse* m, unsigned driverinstance) +static gBool _init(GMouse* m, unsigned driverinstance) { (void)driverinstance; qwidgetMouse = m; - return TRUE; + return gTrue; } -static bool_t _read(GMouse* m, GMouseReading* pdr) +static gBool _read(GMouse* m, GMouseReading* pdr) { (void)m; @@ -37,7 +37,7 @@ static bool_t _read(GMouse* m, GMouseReading* pdr) pdr->z = qwidgetMouseZ; pdr->buttons = qwidgetMouseButtons; - return TRUE; + return gTrue; } const GMouseVMT GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c index 896074b9..eab13de4 100644 --- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c +++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c @@ -57,9 +57,9 @@ * The settling times. We have set these conservatively at 1ms. * The reading window. We set this to 16 just to reduce noise. High-res panels may need a lower value. */ -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -95,10 +95,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, STMPE610_REG_INT_CTRL, 0x01); // Level interrupt, enable interrupts release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { #if GMOUSE_STMPE610_TEST_MODE static GMouseReading n; @@ -133,14 +133,14 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE610_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } #else // Is there a new sample or a touch transition #if GMOUSE_STMPE610_GPIO_IRQPIN if(!getpin_irq(m)) - return FALSE; + return gFalse; #endif // Is there something in the fifo @@ -157,7 +157,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE610_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } // No new result @@ -165,7 +165,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE610_REG_INT_STA, 0xFF); #endif release_bus(m); - return FALSE; + return gFalse; } #endif @@ -229,7 +229,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) #endif #endif - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h index 14917e53..a821ee7c 100644 --- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h +++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h @@ -33,11 +33,11 @@ // If GFXON this is a really slow CPU and we should always clear the FIFO between reads. #define GMOUSE_STMPE610_SLOW_CPU GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } #if GMOUSE_STMPE610_GPIO_IRQPIN - static bool_t getpin_irq(GMouse* m) { + static gBool getpin_irq(GMouse* m) { } #endif diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c index 90496b29..fe978828 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c @@ -57,9 +57,9 @@ * The settling times. We have set these conservatively at 1ms. * The reading window. We set this to 16 just to reduce noise. High-res panels may need a lower value. */ -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -95,10 +95,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, STMPE811_REG_INT_CTRL, 0x01); // Level interrupt, enable interrupts release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { #if GMOUSE_STMPE811_TEST_MODE static GMouseReading n; @@ -133,14 +133,14 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE811_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } #else // Is there a new sample or a touch transition #if GMOUSE_STMPE811_GPIO_IRQPIN if(!getpin_irq(m)) - return FALSE; + return gFalse; #endif // Is there something in the fifo @@ -157,7 +157,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE811_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } // No new result @@ -165,7 +165,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE811_REG_INT_STA, 0xFF); #endif release_bus(m); - return FALSE; + return gFalse; } #endif @@ -228,7 +228,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) #endif #endif - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h index fb979f8b..dfe44ed7 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h @@ -33,11 +33,11 @@ // If GFXON this is a really slow CPU and we should always clear the FIFO between reads. #define GMOUSE_STMPE811_SLOW_CPU GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } #if GMOUSE_STMPE811_GPIO_IRQPIN - static bool_t getpin_irq(GMouse* m) { + static gBool getpin_irq(GMouse* m) { } #endif -- cgit v1.2.3