diff options
Diffstat (limited to 'demos/games/tetris/Example_Makefiles/stm32f4')
4 files changed, 18 insertions, 18 deletions
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h b/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h index 35ef653d..e14def7d 100644 --- a/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h +++ b/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h @@ -18,8 +18,8 @@ // For a multiple display configuration we would put all this in a structure and then // set g->board to that structure. -#define GDISP_REG ((volatile uint16_t *) 0x60000000)[0] /* RS = 0 */ -#define GDISP_RAM ((volatile uint16_t *) 0x60020000)[0] /* RS = 1 */ +#define GDISP_REG ((volatile gU16 *) 0x60000000)[0] /* RS = 0 */ +#define GDISP_RAM ((volatile gU16 *) 0x60020000)[0] /* RS = 1 */ #define GDISP_DMA_STREAM STM32_DMA2_STREAM6 #define FSMC_BANK 0 @@ -116,7 +116,7 @@ static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) state; } -static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) { +static GFXINLINE void set_backlight(GDisplay *g, gU8 percent) { (void) g; pwmEnableChannel(&PWMD3, 2, percent); } @@ -129,12 +129,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; } @@ -149,7 +149,7 @@ static GFXINLINE void setwritemode(GDisplay *g) { FSMC_Bank1->BTCR[FSMC_BANK+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0; /* FSMC timing */ } -static GFXINLINE uint16_t read_data(GDisplay *g) { +static GFXINLINE gU16 read_data(GDisplay *g) { (void) g; return GDISP_RAM; } diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h b/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h index 4ba46339..6b599207 100644 --- a/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h +++ b/demos/games/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h @@ -43,11 +43,11 @@ static GFXINLINE void release_bus(void) spiReleaseBus(&SPID1); } -static GFXINLINE uint16_t read_value(uint16_t port) +static GFXINLINE gU16 read_value(gU16 port) { - static uint8_t txbuf[3] = {0}; - static uint8_t rxbuf[3] = {0}; - uint16_t ret; + static gU8 txbuf[3] = {0}; + static gU8 rxbuf[3] = {0}; + gU16 ret; txbuf[0] = port; diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h index eef222fa..1114853c 100644 --- a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h +++ b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h @@ -85,15 +85,15 @@ static GFXINLINE void release_bus(GMouse* m) { spiReleaseBus(&SPID1); } -static GFXINLINE uint16_t read_value(GMouse* m, uint16_t port) { - static uint8_t txbuf[3] = {0}; - static uint8_t rxbuf[3] = {0}; +static GFXINLINE gU16 read_value(GMouse* m, gU16 port) { + static gU8 txbuf[3] = {0}; + static gU8 rxbuf[3] = {0}; (void) m; txbuf[0] = port; spiExchange(&SPID1, 3, txbuf, rxbuf); - return ((uint16_t)rxbuf[1] << 5) | (rxbuf[2] >> 3); + return ((gU16)rxbuf[1] << 5) | (rxbuf[2] >> 3); } #endif /* _GINPUT_LLD_MOUSE_BOARD_H */ diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old index f5f39c63..5b520a3d 100644 --- a/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old +++ b/demos/games/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old @@ -57,10 +57,10 @@ static GFXINLINE void release_bus(void) { spiReleaseBus(&SPID1); } -static GFXINLINE uint16_t read_value(uint16_t port) { - static uint8_t txbuf[3] = {0}; - static uint8_t rxbuf[3] = {0}; - uint16_t ret; +static GFXINLINE gU16 read_value(gU16 port) { + static gU8 txbuf[3] = {0}; + static gU8 rxbuf[3] = {0}; + gU16 ret; txbuf[0] = port; |