diff options
Diffstat (limited to 'boards/base/Marlin')
| -rw-r--r-- | boards/base/Marlin/board_RA8875.h | 10 | ||||
| -rw-r--r-- | boards/base/Marlin/gmouse_lld_FT5x06_board.h | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/boards/base/Marlin/board_RA8875.h b/boards/base/Marlin/board_RA8875.h index 46e749cb..76b61c4c 100644 --- a/boards/base/Marlin/board_RA8875.h +++ b/boards/base/Marlin/board_RA8875.h @@ -15,8 +15,8 @@ // For a multiple display configuration we would put all this in a structure and then // set g->board to that structure. -#define GDISP_RAM (*((volatile uint16_t *) 0x68000000)) /* RS = 0 */ -#define GDISP_REG (*((volatile uint16_t *) 0x68020000)) /* RS = 1 */ +#define GDISP_RAM (*((volatile gU16 *) 0x68000000)) /* RS = 0 */ +#define GDISP_REG (*((volatile gU16 *) 0x68020000)) /* RS = 1 */ #define FSMC_BANK 4 @@ -83,13 +83,13 @@ static GFXINLINE void release_bus(GDisplay *g) { (void) g; } -static GFXINLINE void write_index(GDisplay *g, uint16_t index) { +static GFXINLINE void write_index(GDisplay *g, gU16 index) { (void) g; GDISP_REG = index; } -static GFXINLINE void write_data(GDisplay *g, uint16_t data) { +static GFXINLINE void write_data(GDisplay *g, gU16 data) { (void) g; GDISP_RAM = data; @@ -103,7 +103,7 @@ static GFXINLINE void setwritemode(GDisplay *g) { (void) g; } -static GFXINLINE uint16_t read_data(GDisplay *g) { +static GFXINLINE gU16 read_data(GDisplay *g) { (void) g; return GDISP_RAM; diff --git a/boards/base/Marlin/gmouse_lld_FT5x06_board.h b/boards/base/Marlin/gmouse_lld_FT5x06_board.h index fbcaea3d..6afaa063 100644 --- a/boards/base/Marlin/gmouse_lld_FT5x06_board.h +++ b/boards/base/Marlin/gmouse_lld_FT5x06_board.h @@ -51,8 +51,8 @@ static GFXINLINE void release_bus(GMouse* m) { } -static void write_reg(GMouse* m, uint8_t reg, uint8_t val) { - uint8_t txbuf[2]; +static void write_reg(GMouse* m, gU8 reg, gU8 val) { + gU8 txbuf[2]; (void) m; txbuf[0] = reg; @@ -63,8 +63,8 @@ static void write_reg(GMouse* m, uint8_t reg, uint8_t val) { i2cReleaseBus(&I2CD2); } -static uint8_t read_byte(GMouse* m, uint8_t reg) { - uint8_t rxbuf[1]; +static gU8 read_byte(GMouse* m, gU8 reg) { + gU8 rxbuf[1]; (void) m; rxbuf[0] = 0; @@ -76,8 +76,8 @@ static uint8_t read_byte(GMouse* m, uint8_t reg) { return rxbuf[0]; } -static uint16_t read_word(GMouse* m, uint8_t reg) { - uint8_t rxbuf[2]; +static gU16 read_word(GMouse* m, gU8 reg) { + gU8 rxbuf[2]; (void) m; rxbuf[0] = 0; @@ -87,7 +87,7 @@ static uint16_t read_word(GMouse* m, uint8_t reg) { i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, ®, 1, rxbuf, 2, MS2ST(FT5x06_TIMEOUT)); i2cReleaseBus(&I2CD2); - return (((uint16_t)rxbuf[0]) << 8) | rxbuf[1]; + return (((gU16)rxbuf[0]) << 8) | rxbuf[1]; } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ |