diff --git a/bsp/stm32f4xx-HAL/Kconfig b/bsp/stm32f4xx-HAL/Kconfig index 61c4bfc9beeeedf1816c360fb9d3cedcd68832aa..94242ca0f0f8289ecfdb99e485cf87298d845fdd 100644 --- a/bsp/stm32f4xx-HAL/Kconfig +++ b/bsp/stm32f4xx-HAL/Kconfig @@ -339,6 +339,25 @@ if RT_USING_USB_DEVICE default 0x5750 endif +if RT_USING_USB_HOST +menu "USB Host Config" + config USBH_USING_CONTROLLABLE_POWER + bool "using a gpio control usb power" + default y + if USBH_USING_CONTROLLABLE_POWER + config USBH_POWER_PIN + int "power control pin" + default 15 + config USBH_CURRENT_PIN + int "current check pin" + default 86 + endif + config USBH_USING_VBUS + bool "using vbus check pin" + default n +endmenu +endif + diff --git a/bsp/stm32f4xx-HAL/drivers/SConscript b/bsp/stm32f4xx-HAL/drivers/SConscript index b3e0ec1932dcbd7ae208778ad606e4df05aa5cca..cd204cc0ab2d2239ad4fe3d5aa9e365bc47daf9f 100644 --- a/bsp/stm32f4xx-HAL/drivers/SConscript +++ b/bsp/stm32f4xx-HAL/drivers/SConscript @@ -26,11 +26,12 @@ if GetDepend(['RT_USING_WDT']): src += ['drv_iwg.c'] if GetDepend(['RT_USING_USB_DEVICE']): - src += ['drv_usb.c'] + src += ['drv_usbd.c'] if GetDepend(['RT_USING_RTC']): src += ['drv_rtc.c'] - +if GetDepend(['RT_USING_USB_HOST']): + src += ['drv_usbh.c'] CPPPATH = [cwd] group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/stm32f4xx-HAL/drivers/drv_usb.c b/bsp/stm32f4xx-HAL/drivers/drv_usbd.c similarity index 99% rename from bsp/stm32f4xx-HAL/drivers/drv_usb.c rename to bsp/stm32f4xx-HAL/drivers/drv_usbd.c index c3d5fe253c98a386182d9fe9091e46b117ffd437..f828b6d0f56d1e2d15d779cbd112fe5ee94124bb 100644 --- a/bsp/stm32f4xx-HAL/drivers/drv_usb.c +++ b/bsp/stm32f4xx-HAL/drivers/drv_usbd.c @@ -1,5 +1,5 @@ /* - * File : stm32_usb.c + * File : stm32_usbd.c * This file is part of RT-Thread RTOS * COPYRIGHT (C) 2015, RT-Thread Development Team * @@ -11,7 +11,7 @@ * Date Author Notes * 2017-10-30 ZYH the first version */ -#include "drv_usb.h" +#include "drv_usbd.h" #include #include #include "board.h" diff --git a/bsp/stm32f4xx-HAL/drivers/drv_usb.h b/bsp/stm32f4xx-HAL/drivers/drv_usbd.h similarity index 84% rename from bsp/stm32f4xx-HAL/drivers/drv_usb.h rename to bsp/stm32f4xx-HAL/drivers/drv_usbd.h index 35d1ea033a8b214aebad267543d1a1888e8776a5..14a7365230b1609ab289c7bf1f4f9a9184b0a679 100644 --- a/bsp/stm32f4xx-HAL/drivers/drv_usb.h +++ b/bsp/stm32f4xx-HAL/drivers/drv_usbd.h @@ -1,5 +1,5 @@ /* - * File : stm32_usb.h + * File : stm32_usbd.h * This file is part of RT-Thread RTOS * COPYRIGHT (C) 2015, RT-Thread Development Team * @@ -11,8 +11,8 @@ * Date Author Notes * 2017-10-30 ZYH the first version */ -#ifndef __STM32_USB_H__ -#define __STM32_USB_H__ +#ifndef __STM32_USBD_H__ +#define __STM32_USBD_H__ #include int stm_usbd_register(void); diff --git a/bsp/stm32f4xx-HAL/drivers/drv_usbh.c b/bsp/stm32f4xx-HAL/drivers/drv_usbh.c new file mode 100644 index 0000000000000000000000000000000000000000..c35aa4a16c20eda549c1ff6dcb03acfd07b93cc8 --- /dev/null +++ b/bsp/stm32f4xx-HAL/drivers/drv_usbh.c @@ -0,0 +1,279 @@ +/* + * File : stm32_usbh.c + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2015, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2017-10-30 ZYH the first version + */ +#include "drv_usbh.h" +#include +#include +#include "board.h" +#define OTG_FS_PORT 1 +static HCD_HandleTypeDef _stm_hhcd_fs; +static struct rt_completion urb_completion; +void HAL_HCD_MspInit(HCD_HandleTypeDef *hcdHandle) +{ + GPIO_InitTypeDef GPIO_InitStruct; + if (hcdHandle->Instance == USB_OTG_FS) + { + /**USB_OTG_FS GPIO Configuration + PA9 ------> USB_OTG_FS_VBUS + PA10 ------> USB_OTG_FS_ID + PA11 ------> USB_OTG_FS_DM + PA12 ------> USB_OTG_FS_DP + */ + __HAL_RCC_GPIOA_CLK_ENABLE(); +#ifdef USBH_USING_VBUS + GPIO_InitStruct.Pin = GPIO_PIN_9; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); +#endif + GPIO_InitStruct.Pin = GPIO_PIN_12 | GPIO_PIN_11; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF10_OTG_FS; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + + /* Peripheral clock enable */ + __HAL_RCC_USB_OTG_FS_CLK_ENABLE(); + + /* Peripheral interrupt init */ + HAL_NVIC_SetPriority(OTG_FS_IRQn, 5, 0); + HAL_NVIC_EnableIRQ(OTG_FS_IRQn); + } +} + +void HAL_HCD_MspDeInit(HCD_HandleTypeDef *hcdHandle) +{ + if (hcdHandle->Instance == USB_OTG_FS) + { + /* Peripheral clock disable */ + __HAL_RCC_USB_OTG_FS_CLK_DISABLE(); + + /**USB_OTG_FS GPIO Configuration + PA9 ------> USB_OTG_FS_VBUS + PA10 ------> USB_OTG_FS_ID + PA11 ------> USB_OTG_FS_DM + PA12 ------> USB_OTG_FS_DP + */ +#ifdef USBH_USING_VBUS + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9); +#endif + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_12 | GPIO_PIN_11); + + /* Peripheral interrupt Deinit*/ + HAL_NVIC_DisableIRQ(OTG_FS_IRQn); + } +} +void OTG_FS_IRQHandler(void) +{ + rt_interrupt_enter(); + HAL_HCD_IRQHandler(&_stm_hhcd_fs); + rt_interrupt_leave(); +} +void HAL_HCD_SOF_Callback(HCD_HandleTypeDef *hhcd)//提供定时器 +{ + //rt_kprintf("sof callback\n"); +} +static __IO rt_bool_t connect_status = RT_FALSE; +void HAL_HCD_Connect_Callback(HCD_HandleTypeDef *hhcd) +{ + uhcd_t hcd = (uhcd_t)hhcd->pData; + if (!connect_status) + { + connect_status = RT_TRUE; + RT_DEBUG_LOG(RT_DEBUG_USB, ("connected\n")); + rt_usbh_root_hub_connect_handler(hcd, OTG_FS_PORT, RT_FALSE); + } +} +void HAL_HCD_Disconnect_Callback(HCD_HandleTypeDef *hhcd) +{ + uhcd_t hcd = (uhcd_t)hhcd->pData; + if (connect_status) + { + connect_status = RT_FALSE; + RT_DEBUG_LOG(RT_DEBUG_USB, ("disconnnect\n")); + rt_usbh_root_hub_disconnect_handler(hcd, OTG_FS_PORT); + } +} +void HAL_HCD_HC_NotifyURBChange_Callback(HCD_HandleTypeDef *hhcd, uint8_t chnum, HCD_URBStateTypeDef urb_state) +{ + //rt_kprintf("NotifyURBChange_Callback\n"); + rt_completion_done(&urb_completion); +} +static rt_err_t drv_reset_port(rt_uint8_t port) +{ + RT_DEBUG_LOG(RT_DEBUG_USB, ("reset port\n")); + HAL_HCD_ResetPort(&_stm_hhcd_fs); + return RT_EOK; +} + +static int drv_pipe_xfer(upipe_t pipe, rt_uint8_t token, void *buffer, int nbytes, int timeout) +{ + while (1) + { + if(!connect_status) + { + return -1; + } + rt_completion_init(&urb_completion); + HAL_HCD_HC_SubmitRequest(&_stm_hhcd_fs, + pipe->pipe_index, + (pipe->ep.bEndpointAddress & 0x80) >> 7, + pipe->ep.bmAttributes, + token, + buffer, + nbytes, + 0); + rt_completion_wait(&urb_completion, timeout); + if (HAL_HCD_HC_GetState(&_stm_hhcd_fs, pipe->pipe_index) == HC_NAK) + { + RT_DEBUG_LOG(RT_DEBUG_USB, ("nak\n")); + if (pipe->ep.bmAttributes == USB_EP_ATTR_INT) + { + rt_thread_delay((pipe->ep.bInterval * RT_TICK_PER_SECOND / 1000) > 0 ? (pipe->ep.bInterval * RT_TICK_PER_SECOND / 1000) : 1); + } + HAL_HCD_HC_Halt(&_stm_hhcd_fs, pipe->pipe_index); + HAL_HCD_HC_Init(&_stm_hhcd_fs, + pipe->pipe_index, + pipe->ep.bEndpointAddress, + pipe->inst->address, + USB_OTG_SPEED_FULL, + pipe->ep.bmAttributes, + pipe->ep.wMaxPacketSize); + continue; + } + else if(HAL_HCD_HC_GetState(&_stm_hhcd_fs, pipe->pipe_index) == HC_STALL) + { + RT_DEBUG_LOG(RT_DEBUG_USB, ("stall\n")); + pipe->status = UPIPE_STATUS_STALL; + if (pipe->callback != RT_NULL) + { + pipe->callback(pipe); + } + return -1; + } + else if(HAL_HCD_HC_GetState(&_stm_hhcd_fs, pipe->pipe_index) == URB_ERROR) + { + RT_DEBUG_LOG(RT_DEBUG_USB, ("error\n")); + pipe->status = UPIPE_STATUS_ERROR; + if (pipe->callback != RT_NULL) + { + pipe->callback(pipe); + } + return -1; + } + else if (HAL_HCD_HC_GetURBState(&_stm_hhcd_fs, pipe->pipe_index) != URB_NOTREADY && + HAL_HCD_HC_GetURBState(&_stm_hhcd_fs, pipe->pipe_index) != URB_NYET) + { + RT_DEBUG_LOG(RT_DEBUG_USB, ("ok\n")); + pipe->status = UPIPE_STATUS_OK; + if (pipe->callback != RT_NULL) + { + pipe->callback(pipe); + } + return nbytes; + } + return -1; + } +} +static rt_uint16_t pipe_index = 0; +static rt_uint8_t drv_get_free_pipe_index() +{ + rt_uint8_t idx; + for (idx = 1; idx < 16; idx++) + { + if (!(pipe_index & (0x01 << idx))) + { + pipe_index |= (0x01 << idx); + return idx; + } + } + return 0xff; +} +static void drv_free_pipe_index(rt_uint8_t index) +{ + pipe_index &= ~(0x01 << index); +} +static rt_err_t drv_open_pipe(upipe_t pipe) +{ + pipe->pipe_index = drv_get_free_pipe_index(); + + HAL_HCD_HC_Init(&_stm_hhcd_fs, + pipe->pipe_index, + pipe->ep.bEndpointAddress, + pipe->inst->address, + USB_OTG_SPEED_FULL, + pipe->ep.bmAttributes, + pipe->ep.wMaxPacketSize); + /* Set DATA0 PID token*/ + if(_stm_hhcd_fs.hc[pipe->pipe_index].ep_is_in) + { + _stm_hhcd_fs.hc[pipe->pipe_index].toggle_in = 0; + } + else + { + _stm_hhcd_fs.hc[pipe->pipe_index].toggle_out = 0; + } + return RT_EOK; +} +static rt_err_t drv_close_pipe(upipe_t pipe) +{ + HAL_HCD_HC_Halt(&_stm_hhcd_fs, pipe->pipe_index); + drv_free_pipe_index(pipe->pipe_index); + return RT_EOK; +} + +struct uhcd_ops _uhcd_ops = +{ + drv_reset_port, + drv_pipe_xfer, + drv_open_pipe, + drv_close_pipe, +}; + +static rt_err_t _init(rt_device_t device) +{ + HCD_HandleTypeDef *hhcd = (HCD_HandleTypeDef *)device->user_data; + hhcd->Instance = USB_OTG_FS; + hhcd->Init.Host_channels = 8; + hhcd->Init.speed = HCD_SPEED_FULL; + hhcd->Init.dma_enable = DISABLE; + hhcd->Init.phy_itface = HCD_PHY_EMBEDDED; + hhcd->Init.Sof_enable = DISABLE; + RT_ASSERT(HAL_HCD_Init(hhcd) == HAL_OK); + HAL_HCD_Start(hhcd); +#ifdef USBH_USING_CONTROLLABLE_POWER + rt_pin_mode(USBH_POWER_PIN, PIN_MODE_OUTPUT); + + rt_pin_write(USBH_POWER_PIN, PIN_LOW); +#endif + return RT_EOK; +} +int stm_usbh_register(void) +{ + uhcd_t uhcd = (uhcd_t)rt_malloc(sizeof(struct uhcd)); + RT_ASSERT(uhcd != RT_NULL); + rt_memset((void *)uhcd, 0, sizeof(struct uhcd)); + + uhcd->parent.type = RT_Device_Class_USBHost; + uhcd->parent.init = _init; + uhcd->parent.user_data = &_stm_hhcd_fs; + uhcd->ops = &_uhcd_ops; + uhcd->num_ports = 1; + _stm_hhcd_fs.pData = uhcd; + + rt_device_register((rt_device_t)uhcd, "usbh", 0); + rt_usb_host_init(); + return RT_EOK; +} +INIT_DEVICE_EXPORT(stm_usbh_register); diff --git a/bsp/stm32f4xx-HAL/drivers/drv_usbh.h b/bsp/stm32f4xx-HAL/drivers/drv_usbh.h new file mode 100644 index 0000000000000000000000000000000000000000..aba86e0b1d1131038b6fd514c016b55fcd1b1685 --- /dev/null +++ b/bsp/stm32f4xx-HAL/drivers/drv_usbh.h @@ -0,0 +1,20 @@ +/* + * File : stm32_usbh.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2015, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2017-12-12 ZYH the first version + */ +#ifndef __STM32_USBH_H__ +#define __STM32_USBH_H__ +#include + +int stm_usbh_register(void); + +#endif