[drivers] Add mapping macros to map the top level api functions directly to the driver implementation

boards/pic32cz_curiosity_ultra/Makefile.inc

@@ -9,7 +9,11 @@ OBJCOPY = $(GCC_PATH)arm-none-eabi-objcopy
 
 CFLAGS += -Wall -Werror $(INCLUDE) -g3 \
           -ffreestanding -nostdlib -mcpu=cortex-m7 \
-          -DPLATFORM_PIC32CZ -MMD -MP
+          -DPLATFORM_PIC32CZ -MMD -MP \
+          -DWHAL_CFG_GPIO_API_MAPPING_PIC32CZ \
+          -DWHAL_CFG_CLOCK_API_MAPPING_PIC32CZ_PLL \
+          -DWHAL_CFG_UART_API_MAPPING_PIC32CZ \
+          -DWHAL_CFG_SUPPLY_API_MAPPING_PIC32CZ
 LDFLAGS = --omagic -static
 
 LINKER_SCRIPT ?= $(_BOARD_DIR)/linker.ld
@@ -19,11 +23,7 @@ INCLUDE += -I$(_BOARD_DIR) -I$(WHAL_DIR)/boards/peripheral
 BOARD_SOURCE = $(_BOARD_DIR)/ivt.c
 BOARD_SOURCE += $(_BOARD_DIR)/board.c
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/gpio.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/clock.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/uart.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/timer.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/supply.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/flash.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/rng.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/block.c)

boards/pic32cz_curiosity_ultra/board.c

@@ -8,12 +8,14 @@
 
 /* Supply */
 static whal_Supply g_whalSupply = {
-    WHAL_PIC32CZ_SUPPLY_DEVICE,
+    .regmap = { WHAL_PIC32CZ_SUPPLY_REGMAP },
+    /* .driver: direct API mapping */
 };
 
 /* Clock */
 whal_Clock g_whalClock = {
-    WHAL_PIC32CZ_CLOCK_PLL_DEVICE,
+    .regmap = { WHAL_PIC32CZ_CLOCK_PLL_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Pic32czClock_Cfg) {
         /* 300MHz clock */
@@ -60,7 +62,8 @@ static const whal_Pic32czClock_Clk g_peripheralClocks[] = {
 
 /* GPIO */
 whal_Gpio g_whalGpio = {
-    WHAL_PIC32CZ_GPIO_DEVICE,
+    .regmap = { WHAL_PIC32CZ_GPIO_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Pic32czGpio_Cfg) {
         .pinCfgCount = 3,
@@ -89,7 +92,8 @@ whal_Gpio g_whalGpio = {
 
 /* UART */
 whal_Uart g_whalUart = {
-    WHAL_PIC32CZ_SERCOM4_UART_DEVICE,
+    .regmap = { WHAL_PIC32CZ_SERCOM4_UART_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Pic32czUart_Cfg) {
         .baud = WHAL_PIC32CZ_UART_BAUD(115200, 300000000),
@@ -100,7 +104,8 @@ whal_Uart g_whalUart = {
 
 /* Timer */
 whal_Timer g_whalTimer = {
-    WHAL_CORTEX_M7_SYSTICK_DEVICE,
+    .regmap = { WHAL_CORTEX_M7_SYSTICK_REGMAP },
+    .driver = WHAL_CORTEX_M7_SYSTICK_DRIVER,
 
     .cfg = &(whal_SysTick_Cfg) {
         .cyclesPerTick = 300000000 / 1000,
@@ -111,7 +116,8 @@ whal_Timer g_whalTimer = {
 
 /* Flash */
 whal_Flash g_whalFlash = {
-    WHAL_PIC32CZ_FLASH_DEVICE,
+    .regmap = { WHAL_PIC32CZ_FLASH_REGMAP },
+    .driver = WHAL_PIC32CZ_FLASH_DRIVER,
 };
 
 /* SysTick timing */

boards/stm32c031_nucleo/Makefile.inc

@@ -9,7 +9,11 @@ OBJCOPY = $(GCC_PATH)arm-none-eabi-objcopy
 
 CFLAGS += -Wall -Werror $(INCLUDE) -g3 \
           -ffreestanding -nostdlib -mcpu=cortex-m0plus -mthumb \
-          -DPLATFORM_STM32C0 -MMD -MP
+          -DPLATFORM_STM32C0 -MMD -MP \
+          -DWHAL_CFG_GPIO_API_MAPPING_STM32C0 \
+          -DWHAL_CFG_CLOCK_API_MAPPING_STM32C0 \
+          -DWHAL_CFG_UART_API_MAPPING_STM32C0 \
+          -DWHAL_CFG_SPI_API_MAPPING_STM32C0
 LDFLAGS = -mcpu=cortex-m0plus -mthumb -ffreestanding -nostartfiles \
           -Wl,--omagic -static
 
@@ -20,13 +24,9 @@ INCLUDE += -I$(_BOARD_DIR) -I$(WHAL_DIR)/boards/peripheral
 BOARD_SOURCE = $(_BOARD_DIR)/ivt.c
 BOARD_SOURCE += $(_BOARD_DIR)/board.c
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/gpio.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/clock.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/uart.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/timer.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/supply.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/flash.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/spi.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/rng.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/crypto.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/block.c)

boards/stm32c031_nucleo/board.c

@@ -32,7 +32,8 @@ whal_Timeout g_whalTimeout = {
 
 /* Clock */
 whal_Clock g_whalClock = {
-    WHAL_STM32C031_RCC_DEVICE,
+    .regmap = { WHAL_STM32C031_RCC_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32c0Rcc_Cfg) {
         .hsidiv = WHAL_STM32C0_RCC_HSIDIV_1, /* HSI48 / 1 = 48 MHz */
@@ -50,7 +51,8 @@ static const whal_Stm32c0Rcc_Clk g_clocks[] = {
 
 /* GPIO */
 whal_Gpio g_whalGpio = {
-    WHAL_STM32C031_GPIO_DEVICE,
+    .regmap = { WHAL_STM32C031_GPIO_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32c0Gpio_Cfg) {
         .pinCfg = (whal_Stm32c0Gpio_PinCfg[PIN_COUNT]) {
@@ -91,7 +93,8 @@ whal_Gpio g_whalGpio = {
 
 /* Timer */
 whal_Timer g_whalTimer = {
-    WHAL_CORTEX_M0PLUS_SYSTICK_DEVICE,
+    .regmap = { WHAL_CORTEX_M0PLUS_SYSTICK_REGMAP },
+    .driver = WHAL_CORTEX_M0PLUS_SYSTICK_DRIVER,
 
     .cfg = &(whal_SysTick_Cfg) {
         .cyclesPerTick = 48000000 / 1000, /* 48 MHz / 1 kHz = 1 ms tick */
@@ -102,7 +105,8 @@ whal_Timer g_whalTimer = {
 
 /* UART */
 whal_Uart g_whalUart = {
-    WHAL_STM32C031_USART1_DEVICE,
+    .regmap = { WHAL_STM32C031_USART1_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32c0Uart_Cfg) {
         .timeout = &g_whalTimeout,
@@ -112,7 +116,8 @@ whal_Uart g_whalUart = {
 
 /* SPI */
 whal_Spi g_whalSpi = {
-    WHAL_STM32C031_SPI1_DEVICE,
+    .regmap = { WHAL_STM32C031_SPI1_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32c0Spi_Cfg) {
         .pclk = 48000000,
@@ -122,7 +127,8 @@ whal_Spi g_whalSpi = {
 
 /* Flash */
 whal_Flash g_whalFlash = {
-    WHAL_STM32C031_FLASH_DEVICE,
+    .regmap = { WHAL_STM32C031_FLASH_REGMAP },
+    .driver = WHAL_STM32C031_FLASH_DRIVER,
 
     .cfg = &(whal_Stm32c0Flash_Cfg) {
         .startAddr = 0x08000000,

boards/stm32f411_blackpill/Makefile.inc

@@ -10,7 +10,11 @@ OBJCOPY = $(GCC_PATH)arm-none-eabi-objcopy
 CFLAGS += -Wall -Werror $(INCLUDE) -g3 \
           -ffreestanding -nostdlib -mcpu=cortex-m4 -mfloat-abi=hard \
           -mfpu=fpv4-sp-d16 -mthumb \
-          -DPLATFORM_STM32F4 -MMD -MP
+          -DPLATFORM_STM32F4 -MMD -MP \
+          -DWHAL_CFG_GPIO_API_MAPPING_STM32F4 \
+          -DWHAL_CFG_CLOCK_API_MAPPING_STM32F4_PLL \
+          -DWHAL_CFG_UART_API_MAPPING_STM32F4 \
+          -DWHAL_CFG_SPI_API_MAPPING_STM32F4
 LDFLAGS = --omagic -static
 
 LINKER_SCRIPT ?= $(_BOARD_DIR)/linker.ld
@@ -20,13 +24,9 @@ INCLUDE += -I$(_BOARD_DIR) -I$(WHAL_DIR)/boards/peripheral
 BOARD_SOURCE = $(_BOARD_DIR)/ivt.c
 BOARD_SOURCE += $(_BOARD_DIR)/board.c
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/gpio.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/clock.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/uart.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/timer.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/supply.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/flash.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/spi.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/rng.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/crypto.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/block.c)

boards/stm32f411_blackpill/board.c

@@ -39,7 +39,8 @@ static const whal_Stm32f4Flash_Sector g_flashSectors[] = {
 
 /* Clock */
 whal_Clock g_whalClock = {
-    WHAL_STM32F411_RCC_PLL_DEVICE,
+    .regmap = { WHAL_STM32F411_RCC_PLL_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32f4Rcc_Cfg) {
         .sysClkSrc = WHAL_STM32F4_RCC_SYSCLK_SRC_PLL,
@@ -66,7 +67,8 @@ static const whal_Stm32f4Rcc_Clk g_clocks[] = {
 
 /* GPIO */
 whal_Gpio g_whalGpio = {
-    WHAL_STM32F411_GPIO_DEVICE,
+    .regmap = { WHAL_STM32F411_GPIO_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32f4Gpio_Cfg) {
         .pinCfg = (whal_Stm32f4Gpio_PinCfg[PIN_COUNT]) {
@@ -107,7 +109,8 @@ whal_Gpio g_whalGpio = {
 
 /* Timer */
 whal_Timer g_whalTimer = {
-    WHAL_CORTEX_M4_SYSTICK_DEVICE,
+    .regmap = { WHAL_CORTEX_M4_SYSTICK_REGMAP },
+    .driver = WHAL_CORTEX_M4_SYSTICK_DRIVER,
 
     .cfg = &(whal_SysTick_Cfg) {
         .cyclesPerTick = 100000000 / 1000, /* 100 MHz / 1 kHz = 1 ms tick */
@@ -118,7 +121,8 @@ whal_Timer g_whalTimer = {
 
 /* UART */
 whal_Uart g_whalUart = {
-    WHAL_STM32F411_USART2_DEVICE,
+    .regmap = { WHAL_STM32F411_USART2_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32f4Uart_Cfg) {
         .timeout = &g_whalTimeout,
@@ -128,7 +132,8 @@ whal_Uart g_whalUart = {
 
 /* SPI */
 whal_Spi g_whalSpi = {
-    WHAL_STM32F411_SPI1_DEVICE,
+    .regmap = { WHAL_STM32F411_SPI1_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32f4Spi_Cfg) {
         .pclk = 100000000,
@@ -138,7 +143,8 @@ whal_Spi g_whalSpi = {
 
 /* Flash */
 whal_Flash g_whalFlash = {
-    WHAL_STM32F411_FLASH_DEVICE,
+    .regmap = { WHAL_STM32F411_FLASH_REGMAP },
+    .driver = WHAL_STM32F411_FLASH_DRIVER,
 
     .cfg = &(whal_Stm32f4Flash_Cfg) {
         .startAddr = 0x08000000,

boards/stm32h563zi_nucleo/Makefile.inc

@@ -9,7 +9,14 @@ OBJCOPY = $(GCC_PATH)arm-none-eabi-objcopy
 
 CFLAGS += -Wall -Werror $(INCLUDE) -g3 \
           -ffreestanding -nostdlib -mcpu=cortex-m33 \
-          -DPLATFORM_STM32H5 -MMD -MP
+          -DPLATFORM_STM32H5 -MMD -MP \
+          -DWHAL_CFG_GPIO_API_MAPPING_STM32H5 \
+          -DWHAL_CFG_CLOCK_API_MAPPING_STM32H5_PLL \
+          -DWHAL_CFG_UART_API_MAPPING_STM32H5 \
+          -DWHAL_CFG_SPI_API_MAPPING_STM32H5 \
+          -DWHAL_CFG_RNG_API_MAPPING_STM32H5 \
+          -DWHAL_CFG_ETH_API_MAPPING_STM32H5 \
+          -DWHAL_CFG_ETH_PHY_API_MAPPING_LAN8742A
 LDFLAGS = --omagic -static
 
 LINKER_SCRIPT ?= $(_BOARD_DIR)/linker.ld
@@ -19,19 +26,13 @@ INCLUDE += -I$(_BOARD_DIR) -I$(WHAL_DIR)/boards/peripheral
 BOARD_SOURCE = $(_BOARD_DIR)/ivt.c
 BOARD_SOURCE += $(_BOARD_DIR)/board.c
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/gpio.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/clock.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/uart.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/timer.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/supply.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/flash.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/spi.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/rng.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/crypto.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/block.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/eth.c)
-BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/eth_phy/*.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/stm32h5_*.c)
+BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/lan8742a_*.c)
 BOARD_SOURCE += $(wildcard $(WHAL_DIR)/src/*/systick.c)
 
 # Peripheral devices

boards/stm32h563zi_nucleo/board.c

@@ -27,7 +27,8 @@ whal_Timeout g_whalTimeout = {
 
 /* Clock */
 whal_Clock g_whalClock = {
-    WHAL_STM32H563_RCC_PLL_DEVICE,
+    .regmap = { WHAL_STM32H563_RCC_PLL_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32h5Rcc_Cfg) {
         .sysClkSrc = WHAL_STM32H5_RCC_SYSCLK_SRC_PLL1,
@@ -65,7 +66,8 @@ static const whal_Stm32h5Rcc_Clk g_ethClocks[] = {
 
 /* GPIO */
 whal_Gpio g_whalGpio = {
-    WHAL_STM32H563_GPIO_DEVICE,
+    .regmap = { WHAL_STM32H563_GPIO_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32h5Gpio_Cfg) {
         .pinCfg = (whal_Stm32h5Gpio_PinCfg[PIN_COUNT]) {
@@ -156,7 +158,8 @@ whal_Gpio g_whalGpio = {
 
 /* Timer */
 whal_Timer g_whalTimer = {
-    WHAL_CORTEX_M33_SYSTICK_DEVICE,
+    .regmap = { WHAL_CORTEX_M33_SYSTICK_REGMAP },
+    .driver = WHAL_CORTEX_M33_SYSTICK_DRIVER,
 
     .cfg = &(whal_SysTick_Cfg) {
         .cyclesPerTick = 168000000 / 1000, /* 168 MHz / 1 kHz = 1 ms tick */
@@ -167,7 +170,8 @@ whal_Timer g_whalTimer = {
 
 /* UART */
 whal_Uart g_whalUart = {
-    WHAL_STM32H563_USART2_DEVICE,
+    .regmap = { WHAL_STM32H563_USART2_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32h5Uart_Cfg) {
         .timeout = &g_whalTimeout,
@@ -177,7 +181,8 @@ whal_Uart g_whalUart = {
 
 /* SPI */
 whal_Spi g_whalSpi = {
-    WHAL_STM32H563_SPI1_DEVICE,
+    .regmap = { WHAL_STM32H563_SPI1_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32h5Spi_Cfg) {
         .pclk = 168000000,
@@ -187,7 +192,8 @@ whal_Spi g_whalSpi = {
 
 /* RNG */
 whal_Rng g_whalRng = {
-    WHAL_STM32H563_RNG_DEVICE,
+    .regmap = { WHAL_STM32H563_RNG_REGMAP },
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Stm32h5Rng_Cfg) {
         .timeout = &g_whalTimeout,
@@ -197,7 +203,8 @@ whal_Rng g_whalRng = {
 
 /* Flash */
 whal_Flash g_whalFlash = {
-    WHAL_STM32H563_FLASH_DEVICE,
+    .regmap = { WHAL_STM32H563_FLASH_REGMAP },
+    .driver = WHAL_STM32H563_FLASH_DRIVER,
 
     .cfg = &(whal_Stm32h5Flash_Cfg) {
         .startAddr = 0x08000000,
@@ -222,7 +229,8 @@ static uint8_t ethRxBufs[ETH_RX_DESC_COUNT * ETH_RX_BUF_SIZE]
     __attribute__((aligned(4)));
 
 whal_Eth g_whalEth = {
-    WHAL_STM32H563_ETH_DEVICE,
+    .regmap = { WHAL_STM32H563_ETH_REGMAP },
+    /* .driver: direct API mapping */
 
     .macAddr = {0x00, 0x80, 0xE1, 0x00, 0x00, 0x01},
     .cfg = &(whal_Stm32h5Eth_Cfg) {
@@ -242,7 +250,7 @@ whal_Eth g_whalEth = {
 whal_EthPhy g_whalEthPhy = {
     .eth = &g_whalEth,
     .addr = BOARD_ETH_PHY_ADDR,
-    .driver = &whal_Lan8742a_Driver,
+    /* .driver: direct API mapping */
 
     .cfg = &(whal_Lan8742a_Cfg) {
         .timeout = &g_whalTimeout,