aboutsummaryrefslogtreecommitdiffstats
path: root/boards/base/Olimex-STM32-LCD
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-10-23 18:24:49 +1000
committerinmarket <andrewh@inmarket.com.au>2015-10-23 18:24:49 +1000
commit48a9d334b7a5b462b32c17a5fde07159deb4c280 (patch)
tree0f7032657b98730750a74ba6d09d01f2de119d4d /boards/base/Olimex-STM32-LCD
parent17c940423ba2159b20965ea6d004386bc392aa68 (diff)
downloaduGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.tar.gz
uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.tar.bz2
uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.zip
Replace all inline definitions with GFXINLINE
Diffstat (limited to 'boards/base/Olimex-STM32-LCD')
-rw-r--r--boards/base/Olimex-STM32-LCD/board_ILI9320.h22
-rw-r--r--boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h2
2 files changed, 12 insertions, 12 deletions
diff --git a/boards/base/Olimex-STM32-LCD/board_ILI9320.h b/boards/base/Olimex-STM32-LCD/board_ILI9320.h
index fb8c4590..1f3a8c82 100644
--- a/boards/base/Olimex-STM32-LCD/board_ILI9320.h
+++ b/boards/base/Olimex-STM32-LCD/board_ILI9320.h
@@ -13,7 +13,7 @@
#define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
#define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */
-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;
@@ -41,11 +41,11 @@ 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;
if(state)
@@ -54,7 +54,7 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
palSetPad(GPIOE, GPIOE_TFT_RST);
}
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
(void) g;
if(percent)
@@ -63,35 +63,35 @@ static inline void set_backlight(GDisplay *g, uint8_t percent) {
palSetPad(GPIOD, GPIOD_TFT_LIGHT);
}
-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;
}
-static inline void setwritemode(GDisplay *g) {
+static GFXINLINE void setwritemode(GDisplay *g) {
(void) g;
}
-static inline uint16_t read_data(GDisplay *g) {
+static GFXINLINE uint16_t read_data(GDisplay *g) {
(void) g;
return GDISP_RAM;
diff --git a/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h b/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
index 414587cf..071ef081 100644
--- a/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
+++ b/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
@@ -50,7 +50,7 @@ static const ADCConversionGroup adc_x_config = {
ADC_SQR3_SQ2_N(ADC_CHANNEL_IN10) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN11)
};
-static inline void setup_z(void) {
+static GFXINLINE void setup_z(void) {
palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 1, PAL_MODE_INPUT);
palSetPadMode(GPIOC, 2, PAL_MODE_INPUT);