Replace all inline definitions with GFXINLINE

43 files changed, 298 insertions, 298 deletions

diff --git a/drivers/gaudio/vs1053/gaudio_play_lld.c b/drivers/gaudio/vs1053/gaudio_play_lld.c
index eaf677cb..24c5a176 100644
--- a/drivers/gaudio/vs1053/gaudio_play_lld.c
+++ b/drivers/gaudio/vs1053/gaudio_play_lld.c
@@ -81,7 +81,7 @@ static void cmd_write(uint16_t addr, uint16_t data) {
 }
 
 #if VS1053_CLK > 12288000
-	static inline void cmd_writenodreq(uint16_t addr, uint16_t data) {
+	static GFXINLINE void cmd_writenodreq(uint16_t addr, uint16_t data) {
 		uint8_t	buf[4];
 
 		// This is the same as cmd_write() except for it doesn't wait for dreq first
diff --git a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h
index 69683cd0..20e2088d 100644
--- a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h
+++ b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h
@@ -46,7 +46,7 @@
  *			#define EINK_WRITECOUNT			4
  */
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) g;
 }
 
@@ -54,57 +54,57 @@ static void eink_delay(int us) {
 	(void) us;
 }
 
-static inline void setpower_vdd(GDisplay *g, bool_t on) {
+static GFXINLINE void setpower_vdd(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpower_vneg(GDisplay *g, bool_t on) {
+static GFXINLINE void setpower_vneg(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpower_vpos(GDisplay *g, bool_t on) {
+static GFXINLINE void setpower_vpos(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpin_le(GDisplay *g, bool_t on) {
+static GFXINLINE void setpin_le(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpin_oe(GDisplay *g, bool_t on) {
+static GFXINLINE void setpin_oe(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpin_cl(GDisplay *g, bool_t on) {
+static GFXINLINE void setpin_cl(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpin_sph(GDisplay *g, bool_t on) {
+static GFXINLINE void setpin_sph(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpins_data(GDisplay *g, uint8_t value) {
+static GFXINLINE void setpins_data(GDisplay *g, uint8_t value) {
 	(void) g;
 	(void) value;
 }
 
-static inline void setpin_ckv(GDisplay *g, bool_t on) {
+static GFXINLINE void setpin_ckv(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpin_gmode(GDisplay *g, bool_t on) {
+static GFXINLINE void setpin_gmode(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
 
-static inline void setpin_spv(GDisplay *g, bool_t on) {
+static GFXINLINE void setpin_spv(GDisplay *g, bool_t on) {
 	(void) g;
 	(void) on;
 }
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
index 470c2768..ec0df514 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
+++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
@@ -79,7 +79,7 @@
 #define PRIV(g)		((drvPriv *)g->priv)
 
 /* Delay between signal changes, to give time for IO pins to change state. */
-static inline void clockdelay(void)
+static GFXINLINE void clockdelay(void)
 {
 	#if EINK_CLOCKDELAY & 1
 	asm("nop");
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_board_example.h b/drivers/gdisp/ED060SC4/gdisp_lld_board_example.h
index 98f05ee8..6cda606b 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld_board_example.h
+++ b/drivers/gdisp/ED060SC4/gdisp_lld_board_example.h
@@ -45,7 +45,7 @@
 
 
 /* Set up IO pins for the panel connection. */
-static inline void init_board(void) {
+static GFXINLINE void init_board(void) {
 	/* Main SMPS power control, active low
 	 * (open collector so that MOSFET gate can be pulled up to Vbat) */
 	palWritePad(GPIOC, GPIOC_SMPS_CTRL, true);
@@ -69,58 +69,58 @@ static void eink_delay(int us)
 }
 
 /* Turn the E-ink panel Vdd supply (+3.3V) on or off. */
-static inline void setpower_vdd(bool_t on) {
+static GFXINLINE void setpower_vdd(bool_t on) {
 	palWritePad(GPIOB, GPIOB_SMPS_CTRL, !on);
 	palWritePad(GPIOA, GPIOA_EINK_VDD, on);
 }
 
 /* Turn the E-ink panel negative supplies (-15V, -20V) on or off. */
-static inline void setpower_vneg(bool_t on) {
+static GFXINLINE void setpower_vneg(bool_t on) {
 	palWritePad(GPIOA, GPIOA_VNEG_CTRL, on);
 }
 
 /* Turn the E-ink panel positive supplies (-15V, -20V) on or off. */
-static inline void setpower_vpos(bool_t on) {
+static GFXINLINE void setpower_vpos(bool_t on) {
 	palWritePad(GPIOA, GPIOA_VPOS_CTRL, on);
 }
 
 /* Set the state of the LE (source driver Latch Enable) pin. */
-static inline void setpin_le(bool_t on) {
+static GFXINLINE void setpin_le(bool_t on) {
 	palWritePad(GPIOB, GPIOB_EINK_LE, on);
 }
 
 /* Set the state of the OE (source driver Output Enable) pin. */
-static inline void setpin_oe(bool_t on) {
+static GFXINLINE void setpin_oe(bool_t on) {
 	palWritePad(GPIOB, GPIOB_EINK_OE, on);
 }
 
 /* Set the state of the CL (source driver Clock) pin. */
-static inline void setpin_cl(bool_t on) {
+static GFXINLINE void setpin_cl(bool_t on) {
 	palWritePad(GPIOB, GPIOB_EINK_CL, on);
 }
 
 /* Set the state of the SPH (source driver Start Pulse Horizontal) pin. */
-static inline void setpin_sph(bool_t on) {
+static GFXINLINE void setpin_sph(bool_t on) {
 	palWritePad(GPIOB, GPIOB_EINK_SPH, on);
 }
 
 /* Set the state of the D0-D7 (source driver Data) pins. */
-static inline void setpins_data(uint8_t value) {
+static GFXINLINE void setpins_data(uint8_t value) {
 	palWriteGroup(GPIOB, 0xFF, GPIOB_EINK_D0, value);
 }
 
 /* Set the state of the CKV (gate driver Clock Vertical) pin. */
-static inline void setpin_ckv(bool_t on) {
+static GFXINLINE void setpin_ckv(bool_t on) {
 	palWritePad(GPIOB, GPIOB_EINK_CKV, on);
 }
 
 /* Set the state of the GMODE (gate driver Gate Mode) pin. */
-static inline void setpin_gmode(bool_t on) {
+static GFXINLINE void setpin_gmode(bool_t on) {
 	palWritePad(GPIOC, GPIOC_EINK_GMODE, on);
 }
 
 /* Set the state of the SPV (gate driver Start Pulse Vertical) pin. */
-static inline void setpin_spv(bool_t on) {
+static GFXINLINE void setpin_spv(bool_t on) {
 	palWritePad(GPIOB, GPIOB_EINK_SPV, on);
 }
 
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_board_template.h b/drivers/gdisp/ED060SC4/gdisp_lld_board_template.h
index 68129bf8..a45cc208 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld_board_template.h
+++ b/drivers/gdisp/ED060SC4/gdisp_lld_board_template.h
@@ -15,7 +15,7 @@
 #define _GDISP_LLD_BOARD_H
 
 /* Set up IO pins for the panel connection. */
-static inline void init_board(void) {
+static GFXINLINE void init_board(void) {
 	#error Unimplemented
 }
 
@@ -26,57 +26,57 @@ static void eink_delay(int us)
 }
 
 /* Turn the E-ink panel Vdd supply (+3.3V) on or off. */
-static inline void setpower_vdd(bool_t on) {
+static GFXINLINE void setpower_vdd(bool_t on) {
 	#error Unimplemented
 }
 
 /* Turn the E-ink panel negative supplies (-15V, -20V) on or off. */
-static inline void setpower_vneg(bool_t on) {
+static GFXINLINE void setpower_vneg(bool_t on) {
 	#error Unimplemented
 }
 
 /* Turn the E-ink panel positive supplies (-15V, -20V) on or off. */
-static inline void setpower_vpos(bool_t on) {
+static GFXINLINE void setpower_vpos(bool_t on) {
 	#error Unimplemented
 }
 
 /* Set the state of the LE (source driver Latch Enable) pin. */
-static inline void setpin_le(bool_t on) {
+static GFXINLINE void setpin_le(bool_t on) {
 	#error Unimplemented
 }
 
 /* Set the state of the OE (source driver Output Enable) pin. */
-static inline void setpin_oe(bool_t on) {
+static GFXINLINE void setpin_oe(bool_t on) {
 	#error Unimplemented
 }
 
 /* Set the state of the CL (source driver Clock) pin. */
-static inline void setpin_cl(bool_t on) {
+static GFXINLINE void setpin_cl(bool_t on) {
 	#error Unimplemented
 }
 
 /* Set the state of the SPH (source driver Start Pulse Horizontal) pin. */
-static inline void setpin_sph(bool_t on) {
+static GFXINLINE void setpin_sph(bool_t on) {
 	#error Unimplemented
 }
 
 /* Set the state of the D0-D7 (source driver Data) pins. */
-static inline void setpins_data(uint8_t value) {
+static GFXINLINE void setpins_data(uint8_t value) {
 	#error Unimplemented
 }
 
 /* Set the state of the CKV (gate driver Clock Vertical) pin. */
-static inline void setpin_ckv(bool_t on) {
+static GFXINLINE void setpin_ckv(bool_t on) {
 	#error Unimplemented
 }
 
 /* Set the state of the GMODE (gate driver Gate Mode) pin. */
-static inline void setpin_gmode(bool_t on) {
+static GFXINLINE void setpin_gmode(bool_t on) {
 	#error Unimplemented
 }
 
 /* Set the state of the SPV (gate driver Start Pulse Vertical) pin. */
-static inline void setpin_spv(bool_t on) {
+static GFXINLINE void setpin_spv(bool_t on) {
 	#error Unimplemented
 }
 
diff --git a/drivers/gdisp/HX8347D/board_HX8347D_template.h b/drivers/gdisp/HX8347D/board_HX8347D_template.h
index fd40d30c..3e412e99 100644
--- a/drivers/gdisp/HX8347D/board_HX8347D_template.h
+++ b/drivers/gdisp/HX8347D/board_HX8347D_template.h
@@ -8,51 +8,51 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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 busmode16(GDisplay *g) {
+static GFXINLINE void busmode16(GDisplay *g) {
 	(void) g;
 }
 
-static inline void busmode8(GDisplay *g) {
+static GFXINLINE void busmode8(GDisplay *g) {
 	(void) g;
 }
 
-static inline void write_index(GDisplay *g, uint8_t index) {
+static GFXINLINE void write_index(GDisplay *g, uint8_t index) {
 	(void) g;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint8_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t data) {
 	(void) g;
 	(void) data;
 }
 
-static inline void write_ram16(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_ram16(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) data;
 }
diff --git a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
index 9c1e7f66..3456a508 100644
--- a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
+++ b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
@@ -40,7 +40,7 @@
 
 #define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }
 
-static inline void set_viewport(GDisplay* g) {
+static GFXINLINE void set_viewport(GDisplay* g) {
 	write_reg(g, HX8347D_REG_SCL, g->p.x);
 	write_reg(g, HX8347D_REG_SCH, g->p.x >> 8);
 	write_reg(g, HX8347D_REG_ECL, g->p.x + g->p.cx -1);
diff --git a/drivers/gdisp/ILI9320/board_ILI9320_template.h b/drivers/gdisp/ILI9320/board_ILI9320_template.h
index a4787730..a26ffe94 100644
--- a/drivers/gdisp/ILI9320/board_ILI9320_template.h
+++ b/drivers/gdisp/ILI9320/board_ILI9320_template.h
@@ -8,51 +8,51 @@
 #ifndef GDISP_LLD_BOARD_H
 #define GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
diff --git a/drivers/gdisp/ILI9325/board_ILI9325_template.h b/drivers/gdisp/ILI9325/board_ILI9325_template.h
index a4787730..a26ffe94 100644
--- a/drivers/gdisp/ILI9325/board_ILI9325_template.h
+++ b/drivers/gdisp/ILI9325/board_ILI9325_template.h
@@ -8,51 +8,51 @@
 #ifndef GDISP_LLD_BOARD_H
 #define GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
diff --git a/drivers/gdisp/ILI9341/board_ILI9341_template.h b/drivers/gdisp/ILI9341/board_ILI9341_template.h
index c4057b1f..aac744f9 100644
--- a/drivers/gdisp/ILI9341/board_ILI9341_template.h
+++ b/drivers/gdisp/ILI9341/board_ILI9341_template.h
@@ -8,51 +8,51 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
diff --git a/drivers/gdisp/ILI93xx/board_ILI93xx_template.h b/drivers/gdisp/ILI93xx/board_ILI93xx_template.h
index 18dbe653..a5ac23ec 100644
--- a/drivers/gdisp/ILI93xx/board_ILI93xx_template.h
+++ b/drivers/gdisp/ILI93xx/board_ILI93xx_template.h
@@ -8,61 +8,61 @@
 #ifndef GDISP_LLD_BOARD_H
 #define GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g)
+static GFXINLINE void init_board(GDisplay *g)
 {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data)
+static GFXINLINE void write_data(GDisplay *g, uint16_t data)
 {
 	(void) g;
 	(void) 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;
 	
diff --git a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
index b883cee6..f992cdb2 100644
--- a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
+++ b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
@@ -54,7 +54,7 @@
 #define dummy_read(g)               { volatile uint16_t dummy; dummy = read_data(g); (void) dummy; }
 #define write_reg(g, reg, data)     { write_index(g, reg); write_data(g, data); }
 
-static inline uint16_t read_reg(GDisplay *g, uint32_t reg) {
+static GFXINLINE uint16_t read_reg(GDisplay *g, uint32_t reg) {
   write_index(g, reg);
   return read_data(g);
  }
diff --git a/drivers/gdisp/ILI9481/board_ILI9481_template.h b/drivers/gdisp/ILI9481/board_ILI9481_template.h
index c4057b1f..aac744f9 100644
--- a/drivers/gdisp/ILI9481/board_ILI9481_template.h
+++ b/drivers/gdisp/ILI9481/board_ILI9481_template.h
@@ -8,51 +8,51 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
diff --git a/drivers/gdisp/LGDP4532/board_LGDP4532_template.h b/drivers/gdisp/LGDP4532/board_LGDP4532_template.h
index ca89cdc1..ef8e7a3a 100644
--- a/drivers/gdisp/LGDP4532/board_LGDP4532_template.h
+++ b/drivers/gdisp/LGDP4532/board_LGDP4532_template.h
@@ -8,61 +8,61 @@
 #ifndef GDISP_LLD_BOARD_H
 #define GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g)
+static GFXINLINE void init_board(GDisplay *g)
 {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data)
+static GFXINLINE void write_data(GDisplay *g, uint16_t data)
 {
 	(void) g;
 	(void) 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 0;
diff --git a/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h b/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h
index 0545fcd5..00762436 100644
--- a/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h
+++ b/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h
@@ -20,38 +20,38 @@
 //#define GDISP_INITIAL_CONTRAST			50		// The initial contrast percentage
 //#define GDISP_INITIAL_BACKLIGHT			100		// The initial backlight percentage
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) data;
 }
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
index 6439b91e..72841b64 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
@@ -82,7 +82,7 @@
 #define write_reg2(g, cmd, d1, d2)		{ write_index(g, cmd); write_data2(g, d1, d2); }
 #define write_reg3(g, cmd, d1, d2, d3)	{ write_index(g, cmd); write_data3(g, d1, d2, d3); }
 
-static inline void set_viewport(GDisplay* g) {
+static GFXINLINE void set_viewport(GDisplay* g) {
 	write_reg2(g, CASET, GDISP_RAM_X_OFFSET+g->p.x, GDISP_RAM_X_OFFSET+g->p.x+g->p.cx-1);			// Column address set
 	write_reg2(g, PASET, GDISP_RAM_Y_OFFSET+g->p.y, GDISP_RAM_Y_OFFSET+g->p.y+g->p.cy-1);			// Page address set
 	write_index(g, RAMWR);
diff --git a/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h b/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h
index 0545fcd5..00762436 100644
--- a/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h
+++ b/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h
@@ -20,38 +20,38 @@
 //#define GDISP_INITIAL_CONTRAST			50		// The initial contrast percentage
 //#define GDISP_INITIAL_BACKLIGHT			100		// The initial backlight percentage
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) data;
 }
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
index f419abf5..ed885d19 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
@@ -129,7 +129,7 @@
 #define write_cmd4(g, cmd, d1, d2, d3, d4)	{ write_index(g, cmd); write_data4(g, d1, d2, d3, d4); }
 
 #if GDISP_HARDWARE_DRAWPIXEL
-	static inline void set_viewpoint(GDisplay* g) {
+	static GFXINLINE void set_viewpoint(GDisplay* g) {
 		#if GDISP_NOKIA_ORIENTATION && GDISP_NEED_CONTROL
 			switch(g->g.Orientation) {
 			default:
@@ -158,7 +158,7 @@
 	}
 #endif
 
-static inline void set_viewport(GDisplay* g) {
+static GFXINLINE void set_viewport(GDisplay* g) {
 	#if GDISP_NOKIA_ORIENTATION && GDISP_NEED_CONTROL
 		switch(g->g.Orientation) {
 		default:
diff --git a/drivers/gdisp/PCD8544/board_PCD8544_template.h b/drivers/gdisp/PCD8544/board_PCD8544_template.h
index 6dd61429..01cafefa 100644
--- a/drivers/gdisp/PCD8544/board_PCD8544_template.h
+++ b/drivers/gdisp/PCD8544/board_PCD8544_template.h
@@ -8,38 +8,38 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 	(void) 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;
 	(void) data;
 	(void) length;
diff --git a/drivers/gdisp/PCF8812/board_PCF8812_template.h b/drivers/gdisp/PCF8812/board_PCF8812_template.h
index 08ec130d..fef65b55 100644
--- a/drivers/gdisp/PCF8812/board_PCF8812_template.h
+++ b/drivers/gdisp/PCF8812/board_PCF8812_template.h
@@ -8,33 +8,33 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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 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_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 	(void) 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;
 	(void) data;
 	(void) length;
diff --git a/drivers/gdisp/R61505U/board_R61505U_template.h b/drivers/gdisp/R61505U/board_R61505U_template.h
index a4787730..a26ffe94 100644
--- a/drivers/gdisp/R61505U/board_R61505U_template.h
+++ b/drivers/gdisp/R61505U/board_R61505U_template.h
@@ -8,51 +8,51 @@
 #ifndef GDISP_LLD_BOARD_H
 #define GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
diff --git a/drivers/gdisp/RA8875/board_RA8875_template.h b/drivers/gdisp/RA8875/board_RA8875_template.h
index 292484f5..19793bc4 100644
--- a/drivers/gdisp/RA8875/board_RA8875_template.h
+++ b/drivers/gdisp/RA8875/board_RA8875_template.h
@@ -8,46 +8,46 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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;
 }
 
diff --git a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
index 0da233db..a962f2f2 100644
--- a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
+++ b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
@@ -43,13 +43,13 @@
 #define write_reg16(g, reg, data)		{ write_index(g, reg); write_data(g, data); write_index(g, reg+1); write_data(g, (data)>>8); }
 #define write_reg8x2(g, reg, d1, d2)	{ write_index(g, reg); write_data(g, d1); write_data(g, d2); }
 
-static inline void set_cursor(GDisplay *g) {
+static GFXINLINE void set_cursor(GDisplay *g) {
 	write_reg16(g, 0x46, g->p.x);
 	write_reg16(g, 0x48, g->p.y);
 	write_index(g, 0x02);
 }
 
-static inline void set_viewport(GDisplay* g) {
+static GFXINLINE void set_viewport(GDisplay* g) {
 	write_reg16(g, 0x30, g->p.x);				//HSAW0 & HSAW1
 	write_reg16(g, 0x34, g->p.x+g->p.cx-1);		//HEAW0 & HEAW1
 	write_reg16(g, 0x32, g->p.y);				//VSAW0 & VSAW1
@@ -58,7 +58,7 @@ static inline void set_viewport(GDisplay* g) {
 
 // On this controller the back-light is controlled by the controllers internal PWM
 //	which is why it is in this file rather than the board file.
-static inline void set_backlight(GDisplay* g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay* g, uint8_t percent) {
 	uint8_t temp;
 
 	//Work in progress: the RA8875 has a built-in PWM, its output can
diff --git a/drivers/gdisp/S6D1121/board_S6D1121_template.h b/drivers/gdisp/S6D1121/board_S6D1121_template.h
index c4057b1f..aac744f9 100644
--- a/drivers/gdisp/S6D1121/board_S6D1121_template.h
+++ b/drivers/gdisp/S6D1121/board_S6D1121_template.h
@@ -8,51 +8,51 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
diff --git a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
index 0611ae1c..b259b5ca 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
@@ -51,7 +51,7 @@
 #define delay(us)                   gfxSleepMicroseconds(us)
 #define delayms(ms)                 gfxSleepMilliseconds(ms)
 
-static inline void set_cursor(GDisplay *g) {
+static GFXINLINE void set_cursor(GDisplay *g) {
     /* R20h - 8 bit
      * R21h - 9 bit
      */
@@ -77,7 +77,7 @@ static inline void set_cursor(GDisplay *g) {
     write_index(g, 0x22);
 }
 
-static inline void set_viewport(GDisplay *g) {
+static GFXINLINE void set_viewport(GDisplay *g) {
     /* HSA / HEA are 8 bit
      * VSA / VEA are 9 bit
      * use masks 0x00FF and 0x01FF to enforce this
diff --git a/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h b/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h
index a8acf718..345a1a8b 100644
--- a/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h
+++ b/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h
@@ -8,45 +8,45 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g)
+static GFXINLINE void init_board(GDisplay *g)
 {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data)
+static GFXINLINE void write_data(GDisplay *g, uint16_t data)
 {
 	(void) g;
 	(void) data;
diff --git a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
index f66d11d6..9a556a7e 100644
--- a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
+++ b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
@@ -82,7 +82,7 @@
 #define write_reg2(g, cmd, d1, d2)	{ write_index(g, cmd); write_data2(g, d1, d2); }
 #define write_reg3(g, cmd, d1, d2, d3)	{ write_index(g, cmd); write_data3(g, d1, d2, d3); }
 
-static inline void set_viewport(GDisplay* g)
+static GFXINLINE void set_viewport(GDisplay* g)
 {
 	write_reg2(g, SPFD54124B_CMD_CASET, GDISP_RAM_X_OFFSET+g->p.x, GDISP_RAM_X_OFFSET+g->p.x+g->p.cx-1);	// Column address set
 	write_reg2(g, SPFD54124B_CMD_RASET, GDISP_RAM_Y_OFFSET+g->p.y, GDISP_RAM_Y_OFFSET+g->p.y+g->p.cy-1);	// Page address set
diff --git a/drivers/gdisp/SSD1289/board_SSD1289_template.h b/drivers/gdisp/SSD1289/board_SSD1289_template.h
index 346519c4..86478c73 100644
--- a/drivers/gdisp/SSD1289/board_SSD1289_template.h
+++ b/drivers/gdisp/SSD1289/board_SSD1289_template.h
@@ -8,51 +8,51 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
@@ -65,13 +65,13 @@ static inline uint16_t read_data(GDisplay *g) {
 
 #if defined(GDISP_USE_DMA) && 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;
 		(void) buffer;
 		(void) 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;
 		(void) buffer;
 		(void) area;
diff --git a/drivers/gdisp/SSD1306/board_SSD1306_template.h b/drivers/gdisp/SSD1306/board_SSD1306_template.h
index 0bd3f803..9ab8fd30 100644
--- a/drivers/gdisp/SSD1306/board_SSD1306_template.h
+++ b/drivers/gdisp/SSD1306/board_SSD1306_template.h
@@ -10,33 +10,33 @@
 
 //#define SSD1306_PAGE_PREFIX		0x40
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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 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_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 	(void) 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;
 	(void) data;
 	(void) length;
diff --git a/drivers/gdisp/SSD1331/board_SSD1331_template.h b/drivers/gdisp/SSD1331/board_SSD1331_template.h
index 1f202936..db4a8aa2 100644
--- a/drivers/gdisp/SSD1331/board_SSD1331_template.h
+++ b/drivers/gdisp/SSD1331/board_SSD1331_template.h
@@ -8,33 +8,33 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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 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_cmd(GDisplay *g, uint8_t index) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t index) {
 	(void) g;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint8_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t data) {
 	(void) g;
 	(void) data;
 }
diff --git a/drivers/gdisp/SSD1351/board_SSD1351_template.h b/drivers/gdisp/SSD1351/board_SSD1351_template.h
index e28ce23a..dc086977 100644
--- a/drivers/gdisp/SSD1351/board_SSD1351_template.h
+++ b/drivers/gdisp/SSD1351/board_SSD1351_template.h
@@ -8,51 +8,51 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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_cmd(GDisplay *g, uint8_t index) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t index) {
 	(void) g;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint8_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t data) {
 	(void) g;
 	(void) 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 0;
 }
diff --git a/drivers/gdisp/SSD1963/board_SSD1963_template.h b/drivers/gdisp/SSD1963/board_SSD1963_template.h
index 9f214604..4c615438 100644
--- a/drivers/gdisp/SSD1963/board_SSD1963_template.h
+++ b/drivers/gdisp/SSD1963/board_SSD1963_template.h
@@ -22,33 +22,33 @@ static const LCD_Parameters	DisplayTimings[] = {
 	},
 };
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) data;
 }
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
index d3cd9d2a..d68235f9 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
@@ -76,7 +76,7 @@ typedef struct LCD_Parameters {
 #define write_data16(g, data)		{ write_data(g, (data)>>8); write_data(g, (data) & 0xFF); }
 #define read_reg(g, reg)            { write_index(g, reg); read_data(g); }
 
-static inline void set_viewport(GDisplay* g) {
+static GFXINLINE void set_viewport(GDisplay* g) {
 	switch(g->g.Orientation) {
 		default:
 		case GDISP_ROTATE_0:
@@ -124,7 +124,7 @@ static inline void set_viewport(GDisplay* g) {
  *
  *	Backlight appears to be forced off (by chip) when display blanked
  */
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 	// The SSD1963 has a built-in PWM (duty_cycle 00..FF).
 	// Its output can be used by a Dynamic Background Control or by a host (user)
 	// Check your LCD's hardware, the PWM connection is default left open and instead
diff --git a/drivers/gdisp/SSD2119/board_SSD2119_template.h b/drivers/gdisp/SSD2119/board_SSD2119_template.h
index 346519c4..86478c73 100644
--- a/drivers/gdisp/SSD2119/board_SSD2119_template.h
+++ b/drivers/gdisp/SSD2119/board_SSD2119_template.h
@@ -8,51 +8,51 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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;
 	(void) index;
 }
 
-static inline void write_data(GDisplay *g, uint16_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint16_t data) {
 	(void) g;
 	(void) 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 0;
 }
@@ -65,13 +65,13 @@ static inline uint16_t read_data(GDisplay *g) {
 
 #if defined(GDISP_USE_DMA) && 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;
 		(void) buffer;
 		(void) 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;
 		(void) buffer;
 		(void) area;
diff --git a/drivers/gdisp/ST7565/board_ST7565_template.h b/drivers/gdisp/ST7565/board_ST7565_template.h
index 3efdbd46..a73aae89 100644
--- a/drivers/gdisp/ST7565/board_ST7565_template.h
+++ b/drivers/gdisp/ST7565/board_ST7565_template.h
@@ -17,33 +17,33 @@
  * #define ST7565_PAGE_ORDER       4,5,6,7,0,1,2,3
  */
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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 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_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 	(void) 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;
 	(void) data;
 	(void) length;
diff --git a/drivers/gdisp/STM32F429iDiscovery/board_STM32F429iDiscovery_template.h b/drivers/gdisp/STM32F429iDiscovery/board_STM32F429iDiscovery_template.h
index 54c797af..e13af4b3 100644
--- a/drivers/gdisp/STM32F429iDiscovery/board_STM32F429iDiscovery_template.h
+++ b/drivers/gdisp/STM32F429iDiscovery/board_STM32F429iDiscovery_template.h
@@ -33,7 +33,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;
@@ -45,22 +45,22 @@ static inline void init_board(GDisplay *g) {
 	}
 }
 
-static inline void post_init_board(GDisplay *g) {
+static GFXINLINE void post_init_board(GDisplay *g) {
 }
 
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
 }
 
-static inline void acquire_bus(GDisplay *g) {
+static GFXINLINE void acquire_bus(GDisplay *g) {
 }
 
-static inline void release_bus(GDisplay *g) {
+static GFXINLINE void release_bus(GDisplay *g) {
 }
 
-static inline void write_index(GDisplay *g, uint8_t index) {
+static GFXINLINE void write_index(GDisplay *g, uint8_t index) {
 }
 
-static inline void write_data(GDisplay *g, uint8_t data) {
+static GFXINLINE void write_data(GDisplay *g, uint8_t data) {
 }
 
 #endif /* _GDISP_LLD_BOARD_H */
diff --git a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h
index 4ea3e03d..0596fe7b 100644
--- a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h
+++ b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h
@@ -35,7 +35,7 @@ static const ltdcConfig driverCfg = {
 	LTDC_UNUSED_LAYER_CONFIG				// Foreground 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;
@@ -47,12 +47,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 set_backlight(GDisplay* g, uint8_t percent)
+static GFXINLINE void set_backlight(GDisplay* g, uint8_t percent)
 {
 	(void)g;
 	(void)percent;
diff --git a/drivers/gdisp/TLS8204/board_TLS8204_template.h b/drivers/gdisp/TLS8204/board_TLS8204_template.h
index 6dd61429..01cafefa 100644
--- a/drivers/gdisp/TLS8204/board_TLS8204_template.h
+++ b/drivers/gdisp/TLS8204/board_TLS8204_template.h
@@ -8,38 +8,38 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-static inline void init_board(GDisplay *g) {
+static GFXINLINE void init_board(GDisplay *g) {
 	(void) 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;
 	(void) 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_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
 	(void) g;
 	(void) 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;
 	(void) data;
 	(void) length;
diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h
index 0b9cc71b..fcfb1f7a 100644
--- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h
+++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h
@@ -23,19 +23,19 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 
 }
 
-static inline bool_t getpin_pressed(GMouse* m) {
+static GFXINLINE bool_t getpin_pressed(GMouse* m) {
 
 }
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 
 }
 
-static inline uint16_t read_value(GMouse* m, uint16_t port) {
+static GFXINLINE uint16_t read_value(GMouse* m, uint16_t port) {
 
 }
 
diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h
index 46680a16..9042f893 100644
--- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h
+++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h
@@ -28,10 +28,10 @@
 static bool_t init_board(GMouse* m, unsigned driverinstance) {
 }
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 }
 
 static void write_reg(GMouse* m, uint8_t reg, uint8_t val) {
diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h
index a1132568..e5339815 100644
--- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h
+++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h
@@ -24,21 +24,21 @@
  *
  *	Returns TRUE on success, FALSE on failure
  */
-static inline bool_t init_board(GMouse* m, unsigned driverinstance) {
+static GFXINLINE bool_t init_board(GMouse* m, unsigned driverinstance) {
 
 }
 
 /**
  *	Acquire the bus
  */
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 
 }
 
 /**
  *	Release the bus
  */
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 
 }
 
@@ -47,7 +47,7 @@ static inline void release_bus(GMouse* m) {
  *
  *	Return the second byte read in case of interest
  */
-static inline uint8_t write_command(GMouse* m, uint8_t command, uint8_t value) {
+static GFXINLINE uint8_t write_command(GMouse* m, uint8_t command, uint8_t value) {
 }
 
 /**
@@ -55,14 +55,14 @@ static inline uint8_t write_command(GMouse* m, uint8_t command, uint8_t value) {
  *
  *	Return the byte read in case of interest
  */
-static inline uint8_t gfintWriteCommand(GMouse* m, uint8_t command) {
+static GFXINLINE uint8_t gfintWriteCommand(GMouse* m, uint8_t command) {
 }
 
 /*
  *	Read 2 bytes as 16-bit value (command to read must have been sent previously)
  *	Note: Analog value is in bits 15..4, tags (reading status) in bits 3..0
  */
-static inline uint16_t read_value(GMouse* m) {
+static GFXINLINE uint16_t read_value(GMouse* m) {
 
 }
 
diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h
index f3beb19e..f426176d 100644
--- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h
+++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h
@@ -42,10 +42,10 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 	}
 #endif
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 }
 
 static void write_reg(GMouse* m, uint8_t reg, uint8_t val) {
diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h
index 4520cf67..0b307ed2 100644
--- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h
+++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h
@@ -42,10 +42,10 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 	}
 #endif
 
-static inline void aquire_bus(GMouse* m) {
+static GFXINLINE void aquire_bus(GMouse* m) {
 }
 
-static inline void release_bus(GMouse* m) {
+static GFXINLINE void release_bus(GMouse* m) {
 }
 
 static void write_reg(GMouse* m, uint8_t reg, uint8_t val) {