aboutsummaryrefslogtreecommitdiffstats
path: root/boards/base/Embest-STM32-DMSTF4BB
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-11-03 10:51:23 +1000
committerinmarket <andrewh@inmarket.com.au>2018-11-03 10:51:23 +1000
commit7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch)
tree95cf152ef65ff19c7b2515b427bbe86b92b611d0 /boards/base/Embest-STM32-DMSTF4BB
parent8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff)
downloaduGFX-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 'boards/base/Embest-STM32-DMSTF4BB')
-rw-r--r--boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h12
-rw-r--r--boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h14
2 files changed, 13 insertions, 13 deletions
diff --git a/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h b/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h
index b0c8bbb0..0fb14ce7 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h
+++ b/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h
@@ -12,8 +12,8 @@
// set g->board to that structure.
/* Using FSMC A19 (PE3) as DC */
-#define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* DC = 0 */
-#define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* DC = 1 */
+#define GDISP_REG (*((volatile gU16 *) 0x60000000)) /* DC = 0 */
+#define GDISP_RAM (*((volatile gU16 *) 0x60100000)) /* DC = 1 */
#define GDISP_DMA_STREAM STM32_DMA2_STREAM6
#define SET_RST palSetPad(GPIOD, 3);
@@ -108,7 +108,7 @@ static GFXINLINE void setpin_reset(GDisplay *g, gBool state) {
}
}
-static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, gU8 percent) {
(void) g;
pwmEnableChannel(&PWMD4, 1, percent);
}
@@ -121,12 +121,12 @@ 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;
}
@@ -139,7 +139,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/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
index da30c4a7..ceb4187e 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
+++ b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
@@ -77,8 +77,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;
@@ -89,8 +89,8 @@ static void write_reg(GMouse* m, uint8_t reg, uint8_t val) {
i2cReleaseBus(&I2CD1);
}
-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;
@@ -102,8 +102,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;
@@ -113,7 +113,7 @@ static uint16_t read_word(GMouse* m, uint8_t reg) {
i2cMasterTransmitTimeout(&I2CD1, STMPE811_ADDR, &reg, 1, rxbuf, 2, MS2ST(STMPE811_TIMEOUT));
i2cReleaseBus(&I2CD1);
- return (((uint16_t)rxbuf[0]) << 8) | rxbuf[1];
+ return (((gU16)rxbuf[0]) << 8) | rxbuf[1];
}
#endif /* _GINPUT_LLD_MOUSE_BOARD_H */