From 40192caee01bd5fe6c8ed2c61798c95782ccfdd2 Mon Sep 17 00:00:00 2001 From: Amir Hammad Date: Fri, 24 Jun 2016 00:47:47 +0200 Subject: let the user build an array of lld drivers Signed-off-by: Amir Hammad --- src/demo.c | 7 ++++++- src/usbh_lld_stm32f4.c | 13 ++----------- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/demo.c b/src/demo.c index 76c33fd..f6cccf5 100644 --- a/src/demo.c +++ b/src/demo.c @@ -214,7 +214,12 @@ int main(void) * * Pass array of supported device drivers */ - usbh_init(usbh_lld_stm32f4_drivers, device_drivers); + const void *lld_drivers[] = { + &usbh_lld_stm32f4_driver_fs, // Make sure USE_STM32F4_USBH_DRIVER_FS is defined in usbh_config.h +// &usbh_lld_stm32f4_driver_hs, // Make sure USE_STM32F4_USBH_DRIVER_HS is defined in usbh_config.h + 0 + }; + usbh_init(lld_drivers, device_drivers); gpio_clear(GPIOD, GPIO13); LOG_PRINTF("USB init complete\n"); diff --git a/src/usbh_lld_stm32f4.c b/src/usbh_lld_stm32f4.c index 8b98321..49f6cc2 100644 --- a/src/usbh_lld_stm32f4.c +++ b/src/usbh_lld_stm32f4.c @@ -1025,6 +1025,7 @@ static const usbh_driver_t driver_fs = { .root_speed = root_speed, .driver_data = &driver_data_fs }; +const void *usbh_lld_stm32f4_driver_fs = &driver_fs; #endif // USB High Speed - OTG_HS @@ -1044,15 +1045,5 @@ static const usbh_driver_t driver_hs = { .root_speed = root_speed, .driver_data = &driver_data_hs }; +const void *usbh_lld_stm32f4_driver_hs = &driver_hs; #endif - -const void *usbh_lld_stm32f4_drivers[] = { -#if defined(USE_STM32F4_USBH_DRIVER_FS) - &driver_fs, -#endif - -#if defined(USE_STM32F4_USBH_DRIVER_HS) - &driver_hs, -#endif - 0 -}; -- cgit