Replace all inline definitions with GFXINLINE

28 files changed, 220 insertions, 209 deletions

diff --git a/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h b/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h
index a8b42239..67cebb11 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h
+++ b/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h
@@ -42,7 +42,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;
@@ -95,11 +95,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) {
 		CLR_RST;
@@ -108,44 +108,44 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 	}
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	pwmEnableChannel(&PWMD4, 1, 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;
 }
 
-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;
 }
 
 #if defined(GDISP_USE_DMA)
-	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);
@@ -156,7 +156,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/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
index 43a8ad18..fc18c0ec 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
+++ b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
@@ -67,12 +67,12 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 	}
 #endif
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 	(void)		m;
 
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 	(void)		m;
 
 }
diff --git a/boards/base/FireBull-STM32F103-FB/board_SSD1289.h b/boards/base/FireBull-STM32F103-FB/board_SSD1289.h
index e7c07c70..98e323de 100644
--- a/boards/base/FireBull-STM32F103-FB/board_SSD1289.h
+++ b/boards/base/FireBull-STM32F103-FB/board_SSD1289.h
@@ -19,7 +19,7 @@
 #define SET_RD		palSetPad(GPIOD, 15);
 #define CLR_RD		palClearPad(GPIOD, 15);
 
-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.
@@ -43,12 +43,12 @@ 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;
@@ -56,7 +56,7 @@ static inline void setpin_reset(GDisplay *g, bool_t state)
 	/* Nothing to do here - reset pin tied to Vcc */
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent)
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent)
 {
 	(void) g;
 	(void) percent;
@@ -64,17 +64,17 @@ static inline void set_backlight(GDisplay *g, uint8_t percent)
 	/* Nothing to do here - Backlight always on */
 }
 
-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;
 
@@ -85,7 +85,7 @@ static inline void write_index(GDisplay *g, uint16_t index)
 	SET_RS;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data)
+static GFXINLINE void write_data(GDisplay *g, uint16_t data)
 {
 	(void) g;
 
@@ -94,7 +94,7 @@ static inline void write_data(GDisplay *g, uint16_t data)
 	SET_WR;
 }
 
-static inline void setreadmode(GDisplay *g)
+static GFXINLINE void setreadmode(GDisplay *g)
 {
 	(void) g;
 
@@ -103,7 +103,7 @@ static inline void setreadmode(GDisplay *g)
 	CLR_RD;
 }
 
-static inline void setwritemode(GDisplay *g)
+static GFXINLINE void setwritemode(GDisplay *g)
 {
 	(void) g;
 	
@@ -112,7 +112,7 @@ static inline void setwritemode(GDisplay *g)
 	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
 }
 
-static inline uint16_t read_data(GDisplay *g) {
+static GFXINLINE uint16_t read_data(GDisplay *g) {
 	(void) g;
 
 	return palReadPort(GPIOE);
diff --git a/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h b/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h
index b202dd85..a49394ad 100644
--- a/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h
+++ b/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h
@@ -43,14 +43,14 @@ 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;
 
@@ -58,7 +58,7 @@ static inline void aquire_bus(GMouse* m)
     palClearPad(GPIOC, 6);
 }
 
-static inline void release_bus(GMouse* m)
+static GFXINLINE void release_bus(GMouse* m)
 {
 	(void)	m;
 
@@ -66,7 +66,7 @@ static inline void release_bus(GMouse* m)
 	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};
diff --git a/boards/base/HY-MiniSTM32V/board_SSD1289.h b/boards/base/HY-MiniSTM32V/board_SSD1289.h
index 415dffe9..c6c45e2b 100644
--- a/boards/base/HY-MiniSTM32V/board_SSD1289.h
+++ b/boards/base/HY-MiniSTM32V/board_SSD1289.h
@@ -49,7 +49,7 @@ static const PWMConfig pwmcfg =
 #define GDISP_DMA_STREAM        STM32_DMA1_STREAM7
 #define FSMC_BANK               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.
@@ -120,56 +120,56 @@ 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) {}
   else {}
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
   (void) g;
   if (percent > 100) { percent = 100; }
   pwmEnableChannel(&PWMD3, 1, 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;
 }
 
-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;
 }
 
 #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) |                      \
@@ -182,7 +182,7 @@ static inline void dma_with_noinc(GDisplay *g, color_t *buffer, int area) {
   }
 }
 
-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 |  \
diff --git a/boards/base/HY-MiniSTM32V/gmouse_lld_ADS7843_board.h b/boards/base/HY-MiniSTM32V/gmouse_lld_ADS7843_board.h
index 9b2668a6..9ef33f3f 100644
--- a/boards/base/HY-MiniSTM32V/gmouse_lld_ADS7843_board.h
+++ b/boards/base/HY-MiniSTM32V/gmouse_lld_ADS7843_board.h
@@ -63,7 +63,7 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 /*
  * PB6 is connected to TP_IRQ (low active).
  */
-static inline bool_t getpin_pressed(GMouse* m) {
+static GFXINLINE bool_t getpin_pressed(GMouse* m) {
   (void)m;
   return (!palReadPad(GPIOB, 6));
 }
@@ -71,19 +71,19 @@ static inline bool_t getpin_pressed(GMouse* m) {
 /*
  * PA4 is connected to TP_CS (low active):
  */
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
   (void)m;
   spiAcquireBus(&SPID1);
   palClearPad(GPIOA, 4);
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
   (void)m;
   palSetPad(GPIOA, 4);
   spiReleaseBus(&SPID1);
 }
 
-static inline uint16_t read_value(GMouse* m, uint16_t port) {
+static GFXINLINE uint16_t read_value(GMouse* m, uint16_t port) {
   (void)m;
   static uint8_t txbuf[3] = {0};
   static uint8_t rxbuf[3] = {0};
diff --git a/boards/base/Marlin/board_RA8875.h b/boards/base/Marlin/board_RA8875.h
index b1d55a92..4288c8ab 100644
--- a/boards/base/Marlin/board_RA8875.h
+++ b/boards/base/Marlin/board_RA8875.h
@@ -20,7 +20,7 @@
 #define FSMC_BANK				4
 
 
-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;
 
@@ -62,7 +62,7 @@ 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;
 	
 	// FSMC delay reduced as the controller now runs at full speed
@@ -70,40 +70,40 @@ static inline void post_init_board(GDisplay *g) {
 	FSMC_Bank1->BTCR[2] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
 }
 
-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 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/Marlin/gmouse_lld_FT5x06_board.h b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
index ac961d0e..f879ca0c 100644
--- a/boards/base/Marlin/gmouse_lld_FT5x06_board.h
+++ b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
@@ -41,12 +41,12 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 	return TRUE;
 }
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 	(void)		m;
 
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 	(void)		m;
 
 }
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/board_SSD1963.h b/boards/base/Mikromedia-Plus-STM32-M4/board_SSD1963.h
index bcda3e71..62672105 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/board_SSD1963.h
+++ b/boards/base/Mikromedia-Plus-STM32-M4/board_SSD1963.h
@@ -50,7 +50,7 @@ IOBus busDataLo = { GDISP_DATA_LO_PORT, 0xFF, 0 };
 IOBus busDataHi = { GDISP_DATA_HI_PORT, 0xFF, 8 };
 
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	g->board = 0;
 	switch(g->controllerdisplay) {
 	case 0:
@@ -64,11 +64,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) {
 		CLR_RST;
@@ -77,17 +77,17 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 	}
 }
 
-static inline void acquire_bus(GDisplay *g) {
+static GFXINLINE void acquire_bus(GDisplay *g) {
 	(void) g;
 	CLR_CS;
 }
 
-static inline void release_bus(GDisplay *g) {
+static GFXINLINE void release_bus(GDisplay *g) {
 	(void) g;
 	SET_CS;
 }
 
-static inline void write_index(GDisplay *g, uint16_t index) {
+static GFXINLINE void write_index(GDisplay *g, uint16_t index) {
 	(void) g;
 
 	CLR_DC;
@@ -97,7 +97,7 @@ static inline void write_index(GDisplay *g, uint16_t index) {
 	SET_DC;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 
 	palWriteBus(&busDataLo, (data & 0xFF));
@@ -105,19 +105,19 @@ static inline void write_data(GDisplay *g, uint16_t data) {
 	writeStrobe;
 }
 
-static inline void setreadmode(GDisplay *g) {
+static GFXINLINE void setreadmode(GDisplay *g) {
 	(void) g;
 	palSetBusMode(&busDataLo, PAL_MODE_INPUT_PULLUP);
 	palSetBusMode(&busDataHi, PAL_MODE_INPUT_PULLUP);
 }
 
-static inline void setwritemode(GDisplay *g) {
+static GFXINLINE void setwritemode(GDisplay *g) {
 	(void) g;
 	palSetBusMode(&busDataLo, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetBusMode(&busDataHi, PAL_MODE_OUTPUT_PUSHPULL);
 }
 
-static inline uint16_t read_data(GDisplay *g) {
+static GFXINLINE uint16_t read_data(GDisplay *g) {
 	uint16_t data;
 	(void) g;
 
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/gaudio_play_board.h b/boards/base/Mikromedia-Plus-STM32-M4/gaudio_play_board.h
index 3efd162f..84c3d42c 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/gaudio_play_board.h
+++ b/boards/base/Mikromedia-Plus-STM32-M4/gaudio_play_board.h
@@ -32,7 +32,7 @@ static const SPIConfig spicfg = {
 };
 
 // Initialise the board
-static inline void board_init(void) {
+static GFXINLINE void board_init(void) {
 	palSetPadMode(GPIOD, GPIOD_MP3_CS, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetPadMode(GPIOD, GPIOD_MP3_RST, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetPadMode(GPIOD, GPIOD_MP3_DCS, PAL_MODE_OUTPUT_PUSHPULL);
@@ -51,7 +51,7 @@ static inline void board_init(void) {
 #define board_dreq()		GET_DREQ
 
 // Start a command write
-static inline void board_startcmdwrite(void) {
+static GFXINLINE void board_startcmdwrite(void) {
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiAcquireBus(SPI_PORT);
 	#endif
@@ -59,7 +59,7 @@ static inline void board_startcmdwrite(void) {
 }
 
 // End a command write
-static inline void board_endcmdwrite(void) {
+static GFXINLINE void board_endcmdwrite(void) {
 	SET_CS;
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiReleaseBus(SPI_PORT);
@@ -73,7 +73,7 @@ static inline void board_endcmdwrite(void) {
 #define board_endcmdread()		board_endcmdwrite()
 
 // Start a data write
-static inline void board_startdatawrite(void) {
+static GFXINLINE void board_startdatawrite(void) {
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiAcquireBus(SPI_PORT);
 	#endif
@@ -81,7 +81,7 @@ static inline void board_startdatawrite(void) {
 }
 
 // End a data write
-static inline void board_enddatawrite(void) {
+static GFXINLINE void board_enddatawrite(void) {
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiReleaseBus(SPI_PORT);
 	#endif
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h b/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
index 1acec78a..75a1194b 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
+++ b/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
@@ -67,12 +67,12 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 	}
 #endif
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 	(void)		m;
 
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 	(void)		m;
 
 }
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h b/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h
index b09d66c2..43d5eb20 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h
@@ -19,7 +19,7 @@
 #define SET_RD    palSetPad(GPIOE, GPIOE_PMRD);
 #define CLR_RD    palClearPad(GPIOE, GPIOE_PMRD);
 
-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;
@@ -35,11 +35,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) {
 		// reset lcd
@@ -49,7 +49,7 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 	}
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	// TODO: can probably pwm this
 	if(percent) {
@@ -61,11 +61,11 @@ static inline void set_backlight(GDisplay *g, uint8_t 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;
 }
 
@@ -76,37 +76,37 @@ static inline void release_bus(GDisplay *g) {
  *
  * @notapi
  */
-static inline void ili9341_delay(uint16_t dly) {
+static GFXINLINE void ili9341_delay(uint16_t dly) {
   static uint16_t i;
   for(i = 0; i < dly; i++)
     asm("nop");
 }
 
-static inline void write_index(GDisplay *g, uint16_t index) {
+static GFXINLINE void write_index(GDisplay *g, uint16_t index) {
 	(void) g;
 	palWriteGroup(GPIOE, 0x00FF, 0, index);
 	CLR_RS; CLR_WR; ili9341_delay(1); SET_WR; ili9341_delay(1); SET_RS;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	palWriteGroup(GPIOE, 0x00FF, 0, data);
 	CLR_WR; ili9341_delay(1); SET_WR; ili9341_delay(1);
 }
 
-static inline void setreadmode(GDisplay *g) {
+static GFXINLINE void setreadmode(GDisplay *g) {
 	(void) g;
 	// change pin mode to digital input
 	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_INPUT);
 }
 
-static inline void setwritemode(GDisplay *g) {
+static GFXINLINE void setwritemode(GDisplay *g) {
 	(void) g;
 	// change pin mode back to digital output
 	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
 }
 
-static inline uint16_t read_data(GDisplay *g) {
+static GFXINLINE uint16_t read_data(GDisplay *g) {
 	uint16_t	value;
 	(void) g;
 	CLR_RD;
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h b/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h
index 370861ee..99e232fc 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h
@@ -32,7 +32,7 @@ static const SPIConfig spicfg = {
 };
 
 // Initialise the board
-static inline void board_init(void) {
+static GFXINLINE void board_init(void) {
 	palSetPadMode(GPIOC, GPIOC_MP3_CS, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetPadMode(GPIOC, GPIOC_MP3_RST, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetPadMode(GPIOC, GPIOC_MP3_DCS, PAL_MODE_OUTPUT_PUSHPULL);
@@ -51,7 +51,7 @@ static inline void board_init(void) {
 #define board_dreq()		GET_DREQ
 
 // Start a command write
-static inline void board_startcmdwrite(void) {
+static GFXINLINE void board_startcmdwrite(void) {
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiAcquireBus(SPI_PORT);
 	#endif
@@ -59,7 +59,7 @@ static inline void board_startcmdwrite(void) {
 }
 
 // End a command write
-static inline void board_endcmdwrite(void) {
+static GFXINLINE void board_endcmdwrite(void) {
 	SET_CS;
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiReleaseBus(SPI_PORT);
@@ -73,7 +73,7 @@ static inline void board_endcmdwrite(void) {
 #define board_endcmdread()		board_endcmdwrite()
 
 // Start a data write
-static inline void board_startdatawrite(void) {
+static GFXINLINE void board_startdatawrite(void) {
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiAcquireBus(SPI_PORT);
 	#endif
@@ -81,7 +81,7 @@ static inline void board_startdatawrite(void) {
 }
 
 // End a data write
-static inline void board_enddatawrite(void) {
+static GFXINLINE void board_enddatawrite(void) {
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiReleaseBus(SPI_PORT);
 	#endif
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
index f1c1c42f..67e81f4c 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
+++ b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
@@ -69,7 +69,7 @@ static bool_t pwmRunning = FALSE;
  *
  * @notapi
  */
-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;
@@ -129,11 +129,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)
 		palClearPad(IOPORT1, PIOA_LCD_RESET);
@@ -141,7 +141,7 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 		palSetPad(IOPORT1, PIOA_LCD_RESET);
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	if (percent == 100) {
 		/* Turn the pin on - No PWM */
@@ -167,15 +167,15 @@ static inline void set_backlight(GDisplay *g, uint8_t 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;
 	// wait for the previous transfer to complete
 	while(!(pSPI->SPI_SR & AT91C_SPI_TDRE));
@@ -183,7 +183,7 @@ static inline void write_index(GDisplay *g, uint16_t index) {
 	pSPI->SPI_TDR = index & 0xFF;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	// wait for the previous transfer to complete
 	while(!(pSPI->SPI_SR & AT91C_SPI_TDRE));
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
index e74fe5b2..8f0eb357 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
@@ -68,7 +68,7 @@ static bool_t pwmRunning = FALSE;
  *
  * @notapi
  */
-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;
@@ -127,11 +127,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)
 		palClearPad(IOPORT1, PIOA_LCD_RESET);
@@ -139,7 +139,7 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 		palSetPad(IOPORT1, PIOA_LCD_RESET);
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	if (percent == 100) {
 		/* Turn the pin on - No PWM */
@@ -165,15 +165,15 @@ static inline void set_backlight(GDisplay *g, uint8_t 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;
 	// wait for the previous transfer to start
 	while(!(pSPI->SPI_SR & AT91C_SPI_TDRE));
@@ -181,7 +181,7 @@ static inline void write_index(GDisplay *g, uint16_t index) {
 	pSPI->SPI_TDR = index & 0xFF;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	// wait for the previous transfer to start
 	while(!(pSPI->SPI_SR & AT91C_SPI_TDRE));
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h
index 0818c3a5..aee3aa82 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h
@@ -92,40 +92,40 @@
 	#error "SSD1306 board file: Unsupported I2C method"
 #endif
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) g;
 
 	I2C_INIT();
 }
 
-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;
 	(void) percent;
 }
 
-static inline void acquire_bus(GDisplay *g) {
+static GFXINLINE void acquire_bus(GDisplay *g) {
 	(void) g;
 
 	I2C_GETBUS();
 }
 
-static inline void release_bus(GDisplay *g) {
+static GFXINLINE void release_bus(GDisplay *g) {
 	(void) g;
 
 	I2C_WAITCOMPLETE();
 	I2C_RELEASEBUS();
 }
 
-static inline void write_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 
 	I2C_WAITCOMPLETE();
@@ -134,7 +134,7 @@ static inline void write_cmd(GDisplay *g, uint8_t cmd) {
 	I2C_WRITECMDBYTE(cmd);
 }
 
-static inline void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
 	(void) g;
 
 	I2C_WAITCOMPLETE();
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_spi.h b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_spi.h
index 3585d287..ce2696dd 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_spi.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_spi.h
@@ -161,7 +161,7 @@
 	#error "SSD1306 board file: Unsupported SPI method"
 #endif
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) g;
 
 	PinIsOutput	(PORT_DC, PIN_DC);
@@ -171,11 +171,11 @@ static inline void init_board(GDisplay *g) {
 	SPI_INIT();
 }
 
-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;
 
@@ -185,25 +185,25 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 		PinSet(PORT_RESET, PIN_RESET);
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	(void) percent;
 }
 
-static inline void acquire_bus(GDisplay *g) {
+static GFXINLINE void acquire_bus(GDisplay *g) {
 	(void) g;
 
 	SPI_GETBUS();
 }
 
-static inline void release_bus(GDisplay *g) {
+static GFXINLINE void release_bus(GDisplay *g) {
 	(void) g;
 
 	SPI_WAITCOMPLETE();
 	SPI_RELEASEBUS();
 }
 
-static inline void write_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 
 	// Command mode please
@@ -213,7 +213,7 @@ static inline void write_cmd(GDisplay *g, uint8_t cmd) {
 	SPI_WRITEBYTE(cmd);
 }
 
-static inline void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
 	(void) g;
 
 	// Data mode please
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1331.h b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1331.h
index 167f0ce2..e7fc2242 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1331.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1331.h
@@ -158,7 +158,7 @@
 	#error "SSD1331 board file: Unsupported SPI method"
 #endif
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) g;
 
 	PinIsOutput	(PORT_DC, PIN_DC);
@@ -168,11 +168,11 @@ static inline void init_board(GDisplay *g) {
 	SPI_INIT();
 }
 
-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;
 
@@ -182,25 +182,25 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 		PinSet(PORT_RESET, PIN_RESET);
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	(void) percent;
 }
 
-static inline void acquire_bus(GDisplay *g) {
+static GFXINLINE void acquire_bus(GDisplay *g) {
 	(void) g;
 
 	SPI_GETBUS();
 }
 
-static inline void release_bus(GDisplay *g) {
+static GFXINLINE void release_bus(GDisplay *g) {
 	(void) g;
 
 	SPI_WAITCOMPLETE();
 	SPI_RELEASEBUS();
 }
 
-static inline void write_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 
 	// Command mode please
@@ -210,7 +210,7 @@ static inline void write_cmd(GDisplay *g, uint8_t cmd) {
 	SPI_WRITEBYTE(cmd);
 }
 
-static inline void write_data(GDisplay *g, uint8_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t data) {
 	(void) g;
 
 	// Data mode please
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_TLS8204.h b/boards/base/Olimex-SAM7EX256-GE8/board_TLS8204.h
index 137808da..b4381e99 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_TLS8204.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_TLS8204.h
@@ -147,7 +147,7 @@
 	#error "TLS8204 board file: Unsupported SPI method"
 #endif
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) g;
 
 	PinIsOutput	(PORT_DC, PIN_DC);
@@ -157,11 +157,11 @@ static inline void init_board(GDisplay *g) {
 	SPI_INIT();
 }
 
-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;
 
@@ -171,25 +171,25 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
 		PinSet(PORT_RESET, PIN_RESET);
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	(void) percent;
 }
 
-static inline void acquire_bus(GDisplay *g) {
+static GFXINLINE void acquire_bus(GDisplay *g) {
 	(void) g;
 
 	SPI_GETBUS();
 }
 
-static inline void release_bus(GDisplay *g) {
+static GFXINLINE void release_bus(GDisplay *g) {
 	(void) g;
 
 	SPI_WAITCOMPLETE();
 	SPI_RELEASEBUS();
 }
 
-static inline void write_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 
 	// Command mode please
@@ -199,7 +199,7 @@ static inline void write_cmd(GDisplay *g, uint8_t cmd) {
 	SPI_WRITEBYTE(cmd);
 }
 
-static inline void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
 	(void) g;
 
 	// Data mode please
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);
diff --git a/boards/base/RaspberryPi/FreeRTOS/mmio.h b/boards/base/RaspberryPi/FreeRTOS/mmio.h
index 89bea700..1a7fb5c2 100644
--- a/boards/base/RaspberryPi/FreeRTOS/mmio.h
+++ b/boards/base/RaspberryPi/FreeRTOS/mmio.h
@@ -6,14 +6,14 @@
 #include <stdint.h>
  
 // write to MMIO register
-static inline void mmio_write(uint32_t reg, uint32_t data) {
+static GFXINLINE void mmio_write(uint32_t reg, uint32_t data) {
     uint32_t *ptr = (uint32_t*)reg;
     asm volatile("str %[data], [%[reg]]"
 	     : : [reg]"r"(ptr), [data]"r"(data));
 }
  
 // read from MMIO register
-static inline uint32_t mmio_read(uint32_t reg) {
+static GFXINLINE uint32_t mmio_read(uint32_t reg) {
     uint32_t *ptr = (uint32_t*)reg;
     uint32_t data;
     asm volatile("ldr %[data], [%[reg]]"
diff --git a/boards/base/STM32F429i-Discovery/board_STM32F429iDiscovery.h b/boards/base/STM32F429i-Discovery/board_STM32F429iDiscovery.h
index 274c97cd..cdea4b54 100644
--- a/boards/base/STM32F429i-Discovery/board_STM32F429iDiscovery.h
+++ b/boards/base/STM32F429i-Discovery/board_STM32F429iDiscovery.h
@@ -48,7 +48,7 @@ static const ltdcConfig driverCfg = {
 	LTDC_UNUSED_LAYER_CONFIG
 };
 
-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;
@@ -88,28 +88,28 @@ 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 set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	(void) g;
 	(void) percent;
 }
 
-static inline void acquire_bus(GDisplay *g) {
+static GFXINLINE void acquire_bus(GDisplay *g) {
 	(void) g;
 
 	spiSelect(SPI_PORT);
 }
 
-static inline void release_bus(GDisplay *g) {
+static GFXINLINE void release_bus(GDisplay *g) {
 	(void) g;
 
 	spiUnselect(SPI_PORT);
 }
 
-static inline void write_index(GDisplay *g, uint8_t index) {
+static GFXINLINE void write_index(GDisplay *g, uint8_t index) {
 	static uint8_t	sindex;
 	(void) g;
 
@@ -118,7 +118,7 @@ static inline void write_index(GDisplay *g, uint8_t index) {
 	spiSend(SPI_PORT, 1, &sindex);
 }
 
-static inline void write_data(GDisplay *g, uint8_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t data) {
 	static uint8_t	sdata;
 	(void) g;
 
diff --git a/boards/base/STM32F429i-Discovery/gmouse_lld_STMPE811_board.h b/boards/base/STM32F429i-Discovery/gmouse_lld_STMPE811_board.h
index f5bab2b9..10b757bc 100644
--- a/boards/base/STM32F429i-Discovery/gmouse_lld_STMPE811_board.h
+++ b/boards/base/STM32F429i-Discovery/gmouse_lld_STMPE811_board.h
@@ -68,12 +68,12 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 	}
 #endif
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 	(void)		m;
 
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 	(void)		m;
 
 }
diff --git a/boards/base/STM32F746-Discovery/board_STM32LTDC.h b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
index ccdd1451..ed691056 100644
--- a/boards/base/STM32F746-Discovery/board_STM32LTDC.h
+++ b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
@@ -13,6 +13,11 @@
 #include "stm32f7xx_hal_gpio.h"
 #include <string.h>
 
+#if !GFX_USE_OS_CHIBIOS
+	#define AFRL	AFR[0]
+	#define AFRH	AFR[1]
+#endif
+
 static const ltdcConfig driverCfg = {
 	480, 272,								// Width, Height (pixels)
 	41, 10,									// Horizontal, Vertical sync (pixels)
@@ -56,181 +61,181 @@ static void configureLcdPins(void)
 	GPIOI->MODER |= GPIO_MODER_MODER15_1;
 	GPIOI->OTYPER &=~ GPIO_OTYPER_OT_15;
 	GPIOI->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR15_0 | GPIO_OSPEEDER_OSPEEDR15_1;
-	GPIOI->AFR[1] |= ((uint32_t)0xE << 4*7);
+	GPIOI->AFRH |= ((uint32_t)0xE << 4*7);
 
 	// PJ0: LCD_R1
 	GPIOJ->MODER |= GPIO_MODER_MODER0_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_0;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR0_0 | GPIO_OSPEEDER_OSPEEDR0_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*0);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*0);
 
 	// PJ1: LCD_R2
 	GPIOJ->MODER |= GPIO_MODER_MODER1_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_1;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR1_0 | GPIO_OSPEEDER_OSPEEDR1_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*1);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*1);
 
 	// PJ2: LCD_R3
 	GPIOJ->MODER |= GPIO_MODER_MODER2_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_2;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR2_0 | GPIO_OSPEEDER_OSPEEDR2_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*2);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*2);
 
 	// PJ3: LCD_R4
 	GPIOJ->MODER |= GPIO_MODER_MODER3_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_3;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR3_0 | GPIO_OSPEEDER_OSPEEDR3_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*3);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*3);
 
 	// PJ4: LCD_R5
 	GPIOJ->MODER |= GPIO_MODER_MODER4_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_4;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR4_0 | GPIO_OSPEEDER_OSPEEDR4_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*4);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*4);
 
 	// PJ5: LCD_R6
 	GPIOJ->MODER |= GPIO_MODER_MODER5_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_5;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR5_0 | GPIO_OSPEEDER_OSPEEDR5_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*5);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*5);
 
 	// PJ6: LCD_R7
 	GPIOJ->MODER |= GPIO_MODER_MODER6_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_6;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR6_0 | GPIO_OSPEEDER_OSPEEDR6_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*6);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*6);
 
 	// PJ7: LCD_G0
 	GPIOJ->MODER |= GPIO_MODER_MODER7_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_7;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR7_0 | GPIO_OSPEEDER_OSPEEDR7_1;
-	GPIOJ->AFR[0] |= ((uint32_t)0xE << 4*7);
+	GPIOJ->AFRL |= ((uint32_t)0xE << 4*7);
 
 	// PJ8: LCD_G1
 	GPIOJ->MODER |= GPIO_MODER_MODER8_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_8;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR8_0 | GPIO_OSPEEDER_OSPEEDR8_1;
-	GPIOJ->AFR[1] |= ((uint32_t)0xE << 4*0);
+	GPIOJ->AFRH |= ((uint32_t)0xE << 4*0);
 
 	// PJ9: LCD_G2
 	GPIOJ->MODER |= GPIO_MODER_MODER9_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_9;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR9_0 | GPIO_OSPEEDER_OSPEEDR9_1;
-	GPIOJ->AFR[1] |= ((uint32_t)0xE << 4*1);
+	GPIOJ->AFRH |= ((uint32_t)0xE << 4*1);
 
 	// PJ10: LCD_G3
 	GPIOJ->MODER |= GPIO_MODER_MODER10_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_10;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR10_0 | GPIO_OSPEEDER_OSPEEDR10_1;
-	GPIOJ->AFR[1] |= ((uint32_t)0xE << 4*2);
+	GPIOJ->AFRH |= ((uint32_t)0xE << 4*2);
 
 	// PJ11: LCD_G4
 	GPIOJ->MODER |= GPIO_MODER_MODER11_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_11;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR11_0 | GPIO_OSPEEDER_OSPEEDR11_1;
-	GPIOJ->AFR[1] |= ((uint32_t)0xE << 4*3);
+	GPIOJ->AFRH |= ((uint32_t)0xE << 4*3);
 
 	// PK0: LCD_G5
 	GPIOK->MODER |= GPIO_MODER_MODER0_0;
 	GPIOK->OTYPER &=~ GPIO_OTYPER_OT_0;
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR0_0 | GPIO_OSPEEDER_OSPEEDR0_1;
-	GPIOK->AFR[0] |= ((uint32_t)0xE << 4*0);
+	GPIOK->AFRL |= ((uint32_t)0xE << 4*0);
 
 	// PK1: LCD_G6
 	GPIOK->MODER |= GPIO_MODER_MODER1_1;
 	GPIOK->OTYPER &=~ GPIO_OTYPER_OT_1;
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR1_0 | GPIO_OSPEEDER_OSPEEDR1_1;
-	GPIOK->AFR[0] |= ((uint32_t)0xE << 4*1);
+	GPIOK->AFRL |= ((uint32_t)0xE << 4*1);
 
 	// PK2: LCD_G7
 	GPIOK->MODER |= GPIO_MODER_MODER2_1;
 	GPIOK->OTYPER &=~ GPIO_OTYPER_OT_2;
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR2_0 | GPIO_OSPEEDER_OSPEEDR2_1;
-	GPIOK->AFR[0] |= ((uint32_t)0xE << 4*2);
+	GPIOK->AFRL |= ((uint32_t)0xE << 4*2);
 
 	// PE4: LCD_B0
 	GPIOE->MODER |= GPIO_MODER_MODER4_1;
 	GPIOE->OTYPER &=~ GPIO_OTYPER_OT_4;
 	GPIOE->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR4_0 | GPIO_OSPEEDER_OSPEEDR4_1;
-	GPIOE->AFR[0] |= ((uint32_t)0xE << 4*4);
+	GPIOE->AFRL |= ((uint32_t)0xE << 4*4);
 
 	// PJ13: LCD_B1
 	GPIOJ->MODER |= GPIO_MODER_MODER13_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_13;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR13_0 | GPIO_OSPEEDER_OSPEEDR13_1;
-	GPIOJ->AFR[1] |= ((uint32_t)0xE << 4*5);
+	GPIOJ->AFRH |= ((uint32_t)0xE << 4*5);
 
 	// PJ14: LCD_B2
 	GPIOJ->MODER |= GPIO_MODER_MODER14_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_14;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR14_0 | GPIO_OSPEEDER_OSPEEDR14_1;
-	GPIOJ->AFR[1] |= ((uint32_t)0xE << 4*6);
+	GPIOJ->AFRH |= ((uint32_t)0xE << 4*6);
 
 	// PJ15: LCD_B3
 	GPIOJ->MODER |= GPIO_MODER_MODER15_1;
 	GPIOJ->OTYPER &=~ GPIO_OTYPER_OT_15;
 	GPIOJ->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR15_0 | GPIO_OSPEEDER_OSPEEDR15_1;
-	GPIOJ->AFR[1] |= ((uint32_t)0xE << 4*7);
+	GPIOJ->AFRH |= ((uint32_t)0xE << 4*7);
 
 	// PG12: LCD_B4
 	GPIOG->MODER |= GPIO_MODER_MODER12_1;
 	GPIOG->OTYPER &=~ GPIO_OTYPER_OT_12;
 	GPIOG->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR12_0 | GPIO_OSPEEDER_OSPEEDR12_1;
-	GPIOG->AFR[1] |= ((uint32_t)0xE << 4*4);
+	GPIOG->AFRH |= ((uint32_t)0xE << 4*4);
 
 	// PK4: LCD_B5
 	GPIOK->MODER |= GPIO_MODER_MODER4_1;
 	GPIOK->OTYPER &=~ GPIO_OTYPER_OT_4;
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR4_0 | GPIO_OSPEEDER_OSPEEDR4_1;
-	GPIOK->AFR[0] |= ((uint32_t)0xE << 4*4);
+	GPIOK->AFRL |= ((uint32_t)0xE << 4*4);
 
 	// PK5: LCD_B6
 	GPIOK->MODER |= GPIO_MODER_MODER5_1;
 	GPIOK->OTYPER &=~ GPIO_OTYPER_OT_5;
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR5_0 | GPIO_OSPEEDER_OSPEEDR5_1;
-	GPIOK->AFR[0] |= ((uint32_t)0xE << 4*5);
+	GPIOK->AFRL |= ((uint32_t)0xE << 4*5);
 
 	// PK6: LCD_B7
 	GPIOK->MODER |= GPIO_MODER_MODER6_1;
 	GPIOK->OTYPER &=~ GPIO_OTYPER_OT_6;
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR6_0 | GPIO_OSPEEDER_OSPEEDR6_1;
-	GPIOK->AFR[0] |= ((uint32_t)0xE << 4*6);
+	GPIOK->AFRL |= ((uint32_t)0xE << 4*6);
 
 	// PK7: LCD_DE
 	GPIOK->MODER |= GPIO_MODER_MODER7_1;
 	GPIOK->OTYPER &=~ GPIO_OTYPER_OT_7;
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR7_0 | GPIO_OSPEEDER_OSPEEDR7_1;
-	GPIOK->AFR[0] |= ((uint32_t)0xE << 4*7);
+	GPIOK->AFRL |= ((uint32_t)0xE << 4*7);
 
 	// PI9: LCD_VSYNC
 	GPIOI->MODER |= GPIO_MODER_MODER9_1;
 	GPIOI->OTYPER &=~ GPIO_OTYPER_OT_9;
 	GPIOI->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR9_0 | GPIO_OSPEEDER_OSPEEDR9_1;
-	GPIOI->AFR[1] |= ((uint32_t)0xE << 4*1);
+	GPIOI->AFRH |= ((uint32_t)0xE << 4*1);
 
 	// PI10: LCD_VSYNC
 	GPIOI->MODER |= GPIO_MODER_MODER10_1;
 	GPIOI->OTYPER &=~ GPIO_OTYPER_OT_10;
 	GPIOI->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR10_0 | GPIO_OSPEEDER_OSPEEDR10_1;
-	GPIOI->AFR[1] |= ((uint32_t)0xE << 4*2);
+	GPIOI->AFRH |= ((uint32_t)0xE << 4*2);
 
 	// PI13: LCD_INT
 	GPIOI->MODER |= GPIO_MODER_MODER13_1;
 	GPIOI->OTYPER &=~ GPIO_OTYPER_OT_13;
 	GPIOI->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR13_0 | GPIO_OSPEEDER_OSPEEDR13_1;
-	GPIOI->AFR[1] |= ((uint32_t)0xE << 4*5);
+	GPIOI->AFRH |= ((uint32_t)0xE << 4*5);
 
 	// PI14: LCD_CLK
 	GPIOI->MODER |= GPIO_MODER_MODER14_1;
 	GPIOI->OTYPER &=~ GPIO_OTYPER_OT_14;
 	GPIOI->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR14_0 | GPIO_OSPEEDER_OSPEEDR14_1;
-	GPIOI->AFR[1] |= ((uint32_t)0xE << 4*6);
+	GPIOI->AFRH |= ((uint32_t)0xE << 4*6);
 
 	// PI8: ???
 	GPIOI->MODER |= GPIO_MODER_MODER8_1;
 	GPIOI->OTYPER &=~ GPIO_OTYPER_OT_8;
 	GPIOI->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR8_0 | GPIO_OSPEEDER_OSPEEDR8_1;
-	GPIOI->AFR[1] |= ((uint32_t)0xE << 4*0);
+	GPIOI->AFRH |= ((uint32_t)0xE << 4*0);
 
 	// PI12: LCD_DISP_PIN
 	GPIOI->MODER |= GPIO_MODER_MODER12_0;
@@ -243,7 +248,7 @@ static void configureLcdPins(void)
 	GPIOK->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR3_0 | GPIO_OSPEEDER_OSPEEDR3_1;
 }
 
-static 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;
@@ -290,11 +295,11 @@ static void init_board(GDisplay *g) {
 	}
 }
 
-static void post_init_board(GDisplay* g) {
+static GFXINLINE void post_init_board(GDisplay* g) {
 	(void) g;
 }
 
-static void set_backlight(GDisplay* g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay* g, uint8_t percent) {
 	(void) g;
 
 	// ST was stupid enought not to hook this up to a pin that
diff --git a/boards/base/STM32F746-Discovery/gmouse_lld_FT5336_board.h b/boards/base/STM32F746-Discovery/gmouse_lld_FT5336_board.h
index 8dd3ebf3..7d61bb25 100644
--- a/boards/base/STM32F746-Discovery/gmouse_lld_FT5336_board.h
+++ b/boards/base/STM32F746-Discovery/gmouse_lld_FT5336_board.h
@@ -40,14 +40,14 @@ static bool_t init_board(GMouse* m, unsigned instance)
 	GPIOH->MODER |= GPIO_MODER_MODER7_1;					// Alternate function
 	GPIOH->OTYPER |= GPIO_OTYPER_OT_7;						// OpenDrain
 	GPIOH->OSPEEDR &= ~GPIO_OSPEEDER_OSPEEDR7;				// LowSpeed
-	GPIOH->AFRL |= (uint32_t)(0x04 << 4*7);					// AF4
+	GPIOH->AFRL |= ((uint32_t)0x04 << 4*7);							// AF4
 
 	// I2C3_SDA    GPIOH8, alternate, opendrain, highspeed
 	RCC->AHB1ENR |= RCC_AHB1ENR_GPIOHEN;					// Enable clock
 	GPIOH->MODER |= GPIO_MODER_MODER8_1;					// Alternate function
 	GPIOH->OTYPER |= GPIO_OTYPER_OT_8;						// OpenDrain
 	GPIOH->OSPEEDR &= ~GPIO_OSPEEDER_OSPEEDR8;				// LowSpeed
-	GPIOH->AFRH |= (uint32_t)(0x04 << 4*0);					// AF4
+	GPIOH->AFRH |= ((uint32_t)0x04 << 4*0);							// AF4
 
 	// Initialize the I2C3 peripheral
 	if (!(i2cInit(I2C3))) {
diff --git a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
index 66475b8f..55e8987a 100644
--- a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
+++ b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
@@ -5,6 +5,10 @@
 #include "stm32f7xx_hal_gpio.h"
 #include "stm32f7xx_hal_sdram.h"
 
+#if GFX_USE_OS_CHIBIOS
+	#define HAL_GPIO_Init(port, ptr)	palSetGroupMode(port, (ptr)->Pin, 0, (ptr)->Mode|((ptr)->Speed<<3)|((ptr)->Pull<<5)|((ptr)->Alternate<<7))
+#endif
+
 #define SDRAM_MEMORY_WIDTH               FMC_SDRAM_MEM_BUS_WIDTH_16
 #define SDCLOCK_PERIOD                   FMC_SDRAM_CLOCK_PERIOD_2
 #define REFRESH_COUNT                    ((uint32_t)0x0603)   /* SDRAM refresh counter (100Mhz SD clock) */
diff --git a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
index 73df79e8..4fb5cebb 100644
--- a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
+++ b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
@@ -1,16 +1,18 @@
 #include "gfx.h"
 #include "stm32f7xx_hal.h"
 
-#if !GFX_USE_OS_CHIBIOS
-systemticks_t gfxSystemTicks(void)
-{
-	return HAL_GetTick();
-}
-
-systemticks_t gfxMillisecondsToTicks(delaytime_t ms)
-{
-	return ms;
-}
+#if GFX_USE_OS_CHIBIOS
+	#define HAL_GPIO_Init(port, ptr)	palSetGroupMode(port, (ptr)->Pin, 0, (ptr)->Mode|((ptr)->Speed<<3)|((ptr)->Pull<<5)|((ptr)->Alternate<<7))
+#else
+	systemticks_t gfxSystemTicks(void)
+	{
+		return HAL_GetTick();
+	}
+
+	systemticks_t gfxMillisecondsToTicks(delaytime_t ms)
+	{
+		return ms;
+	}
 #endif
 
 static void SystemClock_Config(void);