Replace all inline definitions with GFXINLINE

4 files changed, 56 insertions, 45 deletions

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);