diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
commit | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch) | |
tree | 95cf152ef65ff19c7b2515b427bbe86b92b611d0 /drivers/ginput/touch/MAX11802 | |
parent | 8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff) | |
download | uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.gz uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.bz2 uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.zip |
For all source files update integer types to the new gI8 etc type names
Diffstat (limited to 'drivers/ginput/touch/MAX11802')
-rw-r--r-- | drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c | 12 | ||||
-rw-r--r-- | drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c index acfe2142..4fca15d9 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c @@ -29,9 +29,9 @@ static gBool MouseInit(GMouse* m, unsigned driverinstance) { - const uint8_t *p; + const gU8 *p; - static const uint8_t commandList[] = { + static const gU8 commandList[] = { MAX11802_CMD_GEN_WR, 0xf0, // General config - leave TIRQ enabled, even though we ignore it ATM MAX11802_CMD_RES_WR, 0x00, // A-D resolution, hardware config - rewriting default; all 12-bit resolution MAX11802_CMD_AVG_WR, MAX11802_AVG, // A-D averaging - 8 samples, average four median samples @@ -70,8 +70,8 @@ static gBool MouseInit(GMouse* m, unsigned driverinstance) static gBool read_xyz(GMouse* m, GMouseReading* pdr) { - uint8_t readyCount; - uint8_t notReadyCount; + gU8 readyCount; + gU8 notReadyCount; // Assume not touched. pdr->buttons = 0; @@ -153,8 +153,8 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) } // Strip the tags (we need to take care because gCoord is signed - and sign bit gets extended on shift!) - pdr->x = (uint16_t)(pdr->x) >> 4; - pdr->y = (uint16_t)(pdr->y) >> 4; + pdr->x = (gU16)(pdr->x) >> 4; + pdr->y = (gU16)(pdr->y) >> 4; pdr->z = Z_MAX; return gTrue; 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 ec5d6982..f0461db6 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h @@ -47,7 +47,7 @@ static GFXINLINE void release_bus(GMouse* m) { * * Return the second byte read in case of interest */ -static GFXINLINE uint8_t write_command(GMouse* m, uint8_t command, uint8_t value) { +static GFXINLINE gU8 write_command(GMouse* m, gU8 command, gU8 value) { } /** @@ -55,14 +55,14 @@ static GFXINLINE uint8_t write_command(GMouse* m, uint8_t command, uint8_t value * * Return the byte read in case of interest */ -static GFXINLINE uint8_t gfintWriteCommand(GMouse* m, uint8_t command) { +static GFXINLINE gU8 gfintWriteCommand(GMouse* m, gU8 command) { } /* * Read 2 bytes as 16-bit value (command to read must have been sent previously) * Note: Analog value is in bits 15..4, tags (reading status) in bits 3..0 */ -static GFXINLINE uint16_t read_value(GMouse* m) { +static GFXINLINE gU16 read_value(GMouse* m) { } |