espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(hub): Applied new ext_hub api, refactor func names

Browse Source
This commit is contained in:
Roman Leonov
2025-05-15 11:10:23 +02:00
parent fc61875a56
commit 3fd17b8be8
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/usb/hub.c
View File

@@ -771,7 +771,7 @@ esp_err_t hub_port_disable(usb_device_handle_t parent_dev_hdl, uint8_t parent_po
return ret; return ret;
} }
esp_err_t hub_notify_new_dev(uint8_t dev_addr) esp_err_t hub_dev_new(uint8_t dev_addr)
{ {
HUB_DRIVER_ENTER_CRITICAL(); HUB_DRIVER_ENTER_CRITICAL();
HUB_DRIVER_CHECK_FROM_CRIT(p_hub_driver_obj != NULL, ESP_ERR_INVALID_STATE); HUB_DRIVER_CHECK_FROM_CRIT(p_hub_driver_obj != NULL, ESP_ERR_INVALID_STATE);
@@ -794,15 +794,15 @@ esp_err_t hub_notify_new_dev(uint8_t dev_addr)
} }
} }
// Close device // Close device
usbh_dev_close(dev_hdl); ESP_ERROR_CHECK(usbh_dev_close(dev_hdl));
} }
// Logic should not stop the flow, so no error to return // Nothing to do, while Hubs support is not enabled
ret = ESP_OK; ret = ESP_ERR_NOT_SUPPORTED;
#endif // ENABLE_USB_HUBS #endif // ENABLE_USB_HUBS
return ret; return ret;
} }
esp_err_t hub_notify_dev_gone(uint8_t dev_addr) esp_err_t hub_dev_gone(uint8_t dev_addr)
{ {
HUB_DRIVER_ENTER_CRITICAL(); HUB_DRIVER_ENTER_CRITICAL();
HUB_DRIVER_CHECK_FROM_CRIT(p_hub_driver_obj != NULL, ESP_ERR_INVALID_STATE); HUB_DRIVER_CHECK_FROM_CRIT(p_hub_driver_obj != NULL, ESP_ERR_INVALID_STATE);
@@ -813,7 +813,7 @@ esp_err_t hub_notify_dev_gone(uint8_t dev_addr)
ret = ext_hub_dev_gone(dev_addr); ret = ext_hub_dev_gone(dev_addr);
#else #else
// Nothing to do, while Hubs support is not enabled // Nothing to do, while Hubs support is not enabled
ret = ESP_OK; ret = ESP_ERR_NOT_SUPPORTED;
#endif // ENABLE_USB_HUBS #endif // ENABLE_USB_HUBS
return ret; return ret;
} }
@@ -825,7 +825,9 @@ esp_err_t hub_notify_all_free(void)
HUB_DRIVER_CHECK_FROM_CRIT(p_hub_driver_obj != NULL, ESP_ERR_INVALID_STATE); HUB_DRIVER_CHECK_FROM_CRIT(p_hub_driver_obj != NULL, ESP_ERR_INVALID_STATE);
HUB_DRIVER_EXIT_CRITICAL(); HUB_DRIVER_EXIT_CRITICAL();
return ext_hub_all_free(); ext_hub_mark_all_free();
return ESP_OK;
} }
#endif // ENABLE_USB_HUBS #endif // ENABLE_USB_HUBS

4
components/usb/private_include/hub.h
View File

@@ -206,7 +206,7 @@ esp_err_t hub_port_disable(usb_device_handle_t parent_dev_hdl, uint8_t parent_po
* - ESP_OK: New device added successfully * - ESP_OK: New device added successfully
* - ESP_ERR_INVALID_STATE: Hub driver is not in a correct state * - ESP_ERR_INVALID_STATE: Hub driver is not in a correct state
*/ */
esp_err_t hub_notify_new_dev(uint8_t dev_addr); esp_err_t hub_dev_new(uint8_t dev_addr);
/** /**
* @brief Notify Hub driver that device has been removed * @brief Notify Hub driver that device has been removed
@@ -222,7 +222,7 @@ esp_err_t hub_notify_new_dev(uint8_t dev_addr);
* - ESP_OK: A device removed successfully * - ESP_OK: A device removed successfully
* - ESP_ERR_INVALID_STATE: Hub driver is not in a correct state * - ESP_ERR_INVALID_STATE: Hub driver is not in a correct state
*/ */
esp_err_t hub_notify_dev_gone(uint8_t dev_addr); esp_err_t hub_dev_gone(uint8_t dev_addr);
#if ENABLE_USB_HUBS #if ENABLE_USB_HUBS
/** /**