From 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 3 Nov 2018 10:51:23 +1000 Subject: For all source files update integer types to the new gI8 etc type names --- drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c | 2 +- .../ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h | 2 +- drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c | 2 +- .../ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h | 6 +++--- .../ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h | 10 +++++----- .../ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h | 6 +++--- .../ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h | 6 +++--- drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c | 12 ++++++------ .../touch/MAX11802/gmouse_lld_MAX11802_board_template.h | 6 +++--- drivers/ginput/touch/QWidget/example/mywidget.cpp | 2 +- drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c | 2 +- drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c | 2 +- .../touch/STMPE610/gmouse_lld_STMPE610_board_template.h | 6 +++--- drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c | 2 +- .../touch/STMPE811/gmouse_lld_STMPE811_board_template.h | 6 +++--- 15 files changed, 36 insertions(+), 36 deletions(-) (limited to 'drivers/ginput') diff --git a/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c b/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c index 99dfe8fd..d6674d80 100644 --- a/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c +++ b/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c @@ -18,7 +18,7 @@ static adcsample_t samplebuf[GINPUT_DIAL_NUM_PORTS]; #if GINPUT_DIAL_CYCLE_POLL - static uint16_t cycle; + static gU16 cycle; #endif static void GADCCallback(adcsample_t *buffer, void *param) { 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 7b4bcb58..59a78a53 100644 --- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h +++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h @@ -35,7 +35,7 @@ static GFXINLINE void release_bus(GMouse* m) { } -static GFXINLINE uint16_t read_value(GMouse* m, uint16_t port) { +static GFXINLINE gU16 read_value(GMouse* m, gU16 port) { } diff --git a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c index c7afd0d7..e4d6247a 100644 --- a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c +++ b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c @@ -28,7 +28,7 @@ static gBool MouseInit(GMouse* m, unsigned driverinstance) static gBool read_xyz(GMouse* m, GMouseReading* pdr) { - uint8_t rxbuf[10]; + gU8 rxbuf[10]; // We don't support buttons. This is a regular touchscreen pdr->buttons = 0; 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 9cd8eb7d..d4a8365b 100644 --- a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h +++ b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h @@ -31,15 +31,15 @@ static GFXINLINE void release_bus(GMouse* m) { } -static void write_reg(GMouse* m, uint8_t reg, uint8_t val) +static void write_reg(GMouse* m, gU8 reg, gU8 val) { } -static uint8_t read_byte(GMouse* m, uint8_t reg) +static gU8 read_byte(GMouse* m, gU8 reg) { } -static uint16_t read_word(GMouse* m, uint8_t reg) +static gU16 read_word(GMouse* m, gU8 reg) { } 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 5cbbbd1a..5e835f37 100644 --- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h +++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h @@ -33,27 +33,27 @@ static gBool init_board(GMouse* m, unsigned instance) return gTrue; } -static void write_reg(GMouse* m, uint8_t reg, uint8_t val) +static void write_reg(GMouse* m, gU8 reg, gU8 val) { (void)m; (void)reg; (void)val; } -static uint8_t read_byte(GMouse* m, uint8_t reg) +static gU8 read_byte(GMouse* m, gU8 reg) { (void)m; (void)reg; - return (uint16_t)0x00; + return (gU16)0x00; } -static uint16_t read_word(GMouse* m, uint8_t reg) +static gU16 read_word(GMouse* m, gU8 reg) { (void)m; (void)reg; - return (uint16_t)0x0000; + return (gU16)0x0000; } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ 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 45f0a66e..4a36c297 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h @@ -34,13 +34,13 @@ static GFXINLINE void aquire_bus(GMouse* m) { static GFXINLINE void release_bus(GMouse* m) { } -static void write_reg(GMouse* m, uint8_t reg, uint8_t val) { +static void write_reg(GMouse* m, gU8 reg, gU8 val) { } -static uint8_t read_byte(GMouse* m, uint8_t reg) { +static gU8 read_byte(GMouse* m, gU8 reg) { } -static uint16_t read_word(GMouse* m, uint8_t reg) { +static gU16 read_word(GMouse* m, gU8 reg) { } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ 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 d81f55f0..17fa35a9 100644 --- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h +++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h @@ -34,13 +34,13 @@ static GFXINLINE void aquire_bus(GMouse* m) { static GFXINLINE void release_bus(GMouse* m) { } -static void write_reg(GMouse* m, uint8_t reg, uint8_t val) { +static void write_reg(GMouse* m, gU8 reg, gU8 val) { } -static uint8_t read_byte(GMouse* m, uint8_t reg) { +static gU8 read_byte(GMouse* m, gU8 reg) { } -static uint16_t read_word(GMouse* m, uint8_t reg) { +static gU16 read_word(GMouse* m, gU8 reg) { } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ 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) { } diff --git a/drivers/ginput/touch/QWidget/example/mywidget.cpp b/drivers/ginput/touch/QWidget/example/mywidget.cpp index c4599193..0a7ca29e 100644 --- a/drivers/ginput/touch/QWidget/example/mywidget.cpp +++ b/drivers/ginput/touch/QWidget/example/mywidget.cpp @@ -5,7 +5,7 @@ extern GMouse* qwidgetMouse; extern gCoord qwidgetMouseX; extern gCoord qwidgetMouseY; extern gCoord qwidgetMouseZ; -extern uint16_t qwidgetMouseButtons; +extern gU16 qwidgetMouseButtons; MyWidget::MyWidget(QWidget* parent) : QWidget(parent) { diff --git a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c index acbc0406..42b1f2b9 100644 --- a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c +++ b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c @@ -17,7 +17,7 @@ GMouse* qwidgetMouse; gCoord qwidgetMouseX; gCoord qwidgetMouseY; gCoord qwidgetMouseZ; -uint16_t qwidgetMouseButtons; +gU16 qwidgetMouseButtons; static gBool _init(GMouse* m, unsigned driverinstance) { diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c index 21581077..c44289c6 100644 --- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c +++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c @@ -103,7 +103,7 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) #if GMOUSE_STMPE610_TEST_MODE static GMouseReading n; #endif - uint8_t status; + gU8 status; // Button information will be regenerated pdr->buttons = 0; 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 d68a0be3..e4d4527c 100644 --- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h +++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h @@ -48,13 +48,13 @@ static GFXINLINE void aquire_bus(GMouse* m) { static GFXINLINE void release_bus(GMouse* m) { } -static void write_reg(GMouse* m, uint8_t reg, uint8_t val) { +static void write_reg(GMouse* m, gU8 reg, gU8 val) { } -static uint8_t read_byte(GMouse* m, uint8_t reg) { +static gU8 read_byte(GMouse* m, gU8 reg) { } -static uint16_t read_word(GMouse* m, uint8_t reg) { +static gU16 read_word(GMouse* m, gU8 reg) { } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c index ab2c87b4..90ea953f 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c @@ -103,7 +103,7 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) #if GMOUSE_STMPE811_TEST_MODE static GMouseReading n; #endif - uint8_t status; + gU8 status; // Button information will be regenerated pdr->buttons = 0; 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 bcc9ab57..9d38b797 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h @@ -48,13 +48,13 @@ static GFXINLINE void aquire_bus(GMouse* m) { static GFXINLINE void release_bus(GMouse* m) { } -static void write_reg(GMouse* m, uint8_t reg, uint8_t val) { +static void write_reg(GMouse* m, gU8 reg, gU8 val) { } -static uint8_t read_byte(GMouse* m, uint8_t reg) { +static gU8 read_byte(GMouse* m, gU8 reg) { } -static uint16_t read_word(GMouse* m, uint8_t reg) { +static gU16 read_word(GMouse* m, gU8 reg) { } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ -- cgit v1.2.3