From 48a9d334b7a5b462b32c17a5fde07159deb4c280 Mon Sep 17 00:00:00 2001 From: inmarket Date: Fri, 23 Oct 2015 18:24:49 +1000 Subject: Replace all inline definitions with GFXINLINE --- .../Example_Makefiles/stm32f4/board_SSD1289.h | 26 +++++++++++----------- .../stm32f4/ginput_lld_mouse_board.h | 10 ++++----- .../stm32f4/gmouse_lld_ADS7843_board.h | 8 +++---- .../stm32f4/gmouse_lld_ADS7843_board.h.old | 8 +++---- .../stm32f4_chibios_3.x/board_SSD1289.h | 26 +++++++++++----------- .../stm32f4_chibios_3.x/ginput_lld_mouse_board.h | 10 ++++----- .../stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h | 8 +++---- 7 files changed, 48 insertions(+), 48 deletions(-) (limited to 'demos') diff --git a/demos/applications/tetris/Example_Makefiles/stm32f4/board_SSD1289.h b/demos/applications/tetris/Example_Makefiles/stm32f4/board_SSD1289.h index c9761eb5..ba51f0cc 100644 --- a/demos/applications/tetris/Example_Makefiles/stm32f4/board_SSD1289.h +++ b/demos/applications/tetris/Example_Makefiles/stm32f4/board_SSD1289.h @@ -38,7 +38,7 @@ static const PWMConfig pwmcfg = { 0 }; -static inline void init_board(GDisplay *g) { +static GFXINLINE void init_board(GDisplay *g) { // As we are not using multiple displays we set g->board to NULL as we don't use it. g->board = 0; @@ -103,55 +103,55 @@ static inline void init_board(GDisplay *g) { } } -static inline void post_init_board(GDisplay *g) { +static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static inline void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { (void) g; (void) state; } -static inline void set_backlight(GDisplay *g, uint8_t percent) { +static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) { (void) g; pwmEnableChannel(&PWMD3, 2, percent); } -static inline void acquire_bus(GDisplay *g) { +static GFXINLINE void acquire_bus(GDisplay *g) { (void) g; } -static inline void release_bus(GDisplay *g) { +static GFXINLINE void release_bus(GDisplay *g) { (void) g; } -static inline void write_index(GDisplay *g, uint16_t index) { +static GFXINLINE void write_index(GDisplay *g, uint16_t index) { (void) g; GDISP_REG = index; } -static inline void write_data(GDisplay *g, uint16_t data) { +static GFXINLINE void write_data(GDisplay *g, uint16_t data) { (void) g; GDISP_RAM = data; } -static inline void setreadmode(GDisplay *g) { +static GFXINLINE void setreadmode(GDisplay *g) { (void) g; FSMC_Bank1->BTCR[FSMC_BANK+1] = FSMC_BTR1_ADDSET_3 | FSMC_BTR1_DATAST_3 | FSMC_BTR1_BUSTURN_0; /* FSMC timing */ } -static inline void setwritemode(GDisplay *g) { +static GFXINLINE void setwritemode(GDisplay *g) { (void) g; FSMC_Bank1->BTCR[FSMC_BANK+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0; /* FSMC timing */ } -static inline uint16_t read_data(GDisplay *g) { +static GFXINLINE uint16_t read_data(GDisplay *g) { (void) g; return GDISP_RAM; } #if defined(GDISP_USE_DMA) || defined(__DOXYGEN__) - static inline void dma_with_noinc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_noinc(GDisplay *g, color_t *buffer, int area) { (void) g; dmaStreamSetPeripheral(GDISP_DMA_STREAM, buffer); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); @@ -162,7 +162,7 @@ static inline uint16_t read_data(GDisplay *g) { } } - static inline void dma_with_inc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_inc(GDisplay *g, color_t *buffer, int area) { (void) g; dmaStreamSetPeripheral(GDISP_DMA_STREAM, buffer); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PINC | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); diff --git a/demos/applications/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h b/demos/applications/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h index 15dda3f4..39538747 100644 --- a/demos/applications/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h +++ b/demos/applications/tetris/Example_Makefiles/stm32f4/ginput_lld_mouse_board.h @@ -15,7 +15,7 @@ static const SPIConfig spicfg = { /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0, }; -static inline void init_board(void) +static GFXINLINE void init_board(void) { palSetPadMode(GPIOC, 6, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOC, 4, PAL_MODE_INPUT); @@ -26,24 +26,24 @@ static inline void init_board(void) spiStart(&SPID1, &spicfg); } -static inline bool_t getpin_pressed(void) +static GFXINLINE bool_t getpin_pressed(void) { return (!palReadPad(GPIOC, 4)); } -static inline void aquire_bus(void) +static GFXINLINE void aquire_bus(void) { spiAcquireBus(&SPID1); palClearPad(GPIOC, 6); } -static inline void release_bus(void) +static GFXINLINE void release_bus(void) { palSetPad(GPIOC, 6); spiReleaseBus(&SPID1); } -static inline uint16_t read_value(uint16_t port) +static GFXINLINE uint16_t read_value(uint16_t port) { static uint8_t txbuf[3] = {0}; static uint8_t rxbuf[3] = {0}; diff --git a/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h b/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h index ce331056..dc8e979e 100644 --- a/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h +++ b/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h @@ -65,27 +65,27 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) { return TRUE; } -static inline bool_t getpin_pressed(GMouse* m) { +static GFXINLINE bool_t getpin_pressed(GMouse* m) { (void) m; return (!palReadPad(GPIOC, 4)); } -static inline void aquire_bus(GMouse* m) { +static GFXINLINE void aquire_bus(GMouse* m) { (void) m; spiAcquireBus(&SPID1); palClearPad(GPIOC, 6); } -static inline void release_bus(GMouse* m) { +static GFXINLINE void release_bus(GMouse* m) { (void) m; palSetPad(GPIOC, 6); spiReleaseBus(&SPID1); } -static inline uint16_t read_value(GMouse* m, uint16_t port) { +static GFXINLINE uint16_t read_value(GMouse* m, uint16_t port) { static uint8_t txbuf[3] = {0}; static uint8_t rxbuf[3] = {0}; (void) m; diff --git a/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old b/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old index bc523e85..77d82bf8 100644 --- a/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old +++ b/demos/applications/tetris/Example_Makefiles/stm32f4/gmouse_lld_ADS7843_board.h.old @@ -43,21 +43,21 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) return TRUE; } -inline bool_t getpin_pressed(void) { +GFXINLINE bool_t getpin_pressed(void) { return (!palReadPad(GPIOC, 4)); } -static inline void aquire_bus(void) { +static GFXINLINE void aquire_bus(void) { spiAcquireBus(&SPID1); palClearPad(GPIOC, 6); } -static inline void release_bus(void) { +static GFXINLINE void release_bus(void) { palSetPad(GPIOC, 6); spiReleaseBus(&SPID1); } -static inline uint16_t read_value(uint16_t port) { +static GFXINLINE uint16_t read_value(uint16_t port) { static uint8_t txbuf[3] = {0}; static uint8_t rxbuf[3] = {0}; uint16_t ret; diff --git a/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h b/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h index c5c935be..b1f2a8b5 100644 --- a/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h +++ b/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h @@ -38,7 +38,7 @@ static const PWMConfig pwmcfg = { 0 }; -static inline void init_board(GDisplay *g) { +static GFXINLINE void init_board(GDisplay *g) { // As we are not using multiple displays we set g->board to NULL as we don't use it. g->board = 0; @@ -101,55 +101,55 @@ static inline void init_board(GDisplay *g) { } } -static inline void post_init_board(GDisplay *g) { +static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static inline void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { (void) g; (void) state; } -static inline void set_backlight(GDisplay *g, uint8_t percent) { +static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) { (void) g; pwmEnableChannel(&PWMD3, 2, percent); } -static inline void acquire_bus(GDisplay *g) { +static GFXINLINE void acquire_bus(GDisplay *g) { (void) g; } -static inline void release_bus(GDisplay *g) { +static GFXINLINE void release_bus(GDisplay *g) { (void) g; } -static inline void write_index(GDisplay *g, uint16_t index) { +static GFXINLINE void write_index(GDisplay *g, uint16_t index) { (void) g; GDISP_REG = index; } -static inline void write_data(GDisplay *g, uint16_t data) { +static GFXINLINE void write_data(GDisplay *g, uint16_t data) { (void) g; GDISP_RAM = data; } -static inline void setreadmode(GDisplay *g) { +static GFXINLINE void setreadmode(GDisplay *g) { (void) g; FSMC_Bank1->BTCR[FSMC_BANK+1] = FSMC_BTR1_ADDSET_3 | FSMC_BTR1_DATAST_3 | FSMC_BTR1_BUSTURN_0; /* FSMC timing */ } -static inline void setwritemode(GDisplay *g) { +static GFXINLINE void setwritemode(GDisplay *g) { (void) g; FSMC_Bank1->BTCR[FSMC_BANK+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0; /* FSMC timing */ } -static inline uint16_t read_data(GDisplay *g) { +static GFXINLINE uint16_t read_data(GDisplay *g) { (void) g; return GDISP_RAM; } #if defined(GDISP_USE_DMA) || defined(__DOXYGEN__) - static inline void dma_with_noinc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_noinc(GDisplay *g, color_t *buffer, int area) { (void) g; dmaStreamSetPeripheral(GDISP_DMA_STREAM, buffer); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); @@ -160,7 +160,7 @@ static inline uint16_t read_data(GDisplay *g) { } } - static inline void dma_with_inc(GDisplay *g, color_t *buffer, int area) { + static GFXINLINE void dma_with_inc(GDisplay *g, color_t *buffer, int area) { (void) g; dmaStreamSetPeripheral(GDISP_DMA_STREAM, buffer); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PINC | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); diff --git a/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h b/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h index 15dda3f4..39538747 100644 --- a/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h +++ b/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/ginput_lld_mouse_board.h @@ -15,7 +15,7 @@ static const SPIConfig spicfg = { /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0, }; -static inline void init_board(void) +static GFXINLINE void init_board(void) { palSetPadMode(GPIOC, 6, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOC, 4, PAL_MODE_INPUT); @@ -26,24 +26,24 @@ static inline void init_board(void) spiStart(&SPID1, &spicfg); } -static inline bool_t getpin_pressed(void) +static GFXINLINE bool_t getpin_pressed(void) { return (!palReadPad(GPIOC, 4)); } -static inline void aquire_bus(void) +static GFXINLINE void aquire_bus(void) { spiAcquireBus(&SPID1); palClearPad(GPIOC, 6); } -static inline void release_bus(void) +static GFXINLINE void release_bus(void) { palSetPad(GPIOC, 6); spiReleaseBus(&SPID1); } -static inline uint16_t read_value(uint16_t port) +static GFXINLINE uint16_t read_value(uint16_t port) { static uint8_t txbuf[3] = {0}; static uint8_t rxbuf[3] = {0}; diff --git a/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h b/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h index bc523e85..77d82bf8 100644 --- a/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h +++ b/demos/applications/tetris/Example_Makefiles/stm32f4_chibios_3.x/gmouse_lld_ADS7843_board.h @@ -43,21 +43,21 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) return TRUE; } -inline bool_t getpin_pressed(void) { +GFXINLINE bool_t getpin_pressed(void) { return (!palReadPad(GPIOC, 4)); } -static inline void aquire_bus(void) { +static GFXINLINE void aquire_bus(void) { spiAcquireBus(&SPID1); palClearPad(GPIOC, 6); } -static inline void release_bus(void) { +static GFXINLINE void release_bus(void) { palSetPad(GPIOC, 6); spiReleaseBus(&SPID1); } -static inline uint16_t read_value(uint16_t port) { +static GFXINLINE uint16_t read_value(uint16_t port) { static uint8_t txbuf[3] = {0}; static uint8_t rxbuf[3] = {0}; uint16_t ret; -- cgit v1.2.3