alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(usb_host): Changed addr_map to 4x array of uint32

Browse Source
This commit is contained in:
Roman Leonov 2024-07-02 12:42:31 +02:00
parent 1526b80e08
commit eceb27a835
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/usb/usb_host.c
View File

@ -110,7 +110,7 @@ struct client_s {
uint32_t val; uint32_t val;
} flags; } flags;
uint32_t num_done_ctrl_xfer; uint32_t num_done_ctrl_xfer;
uint32_t opened_dev_addr_map; uint32_t opened_dev_addr_map[4];
} dynamic; } dynamic;
// Mux protected members must be protected by host library the mux_lock when accessed // Mux protected members must be protected by host library the mux_lock when accessed
struct { struct {
@ -163,26 +163,25 @@ const char *USB_HOST_TAG = "USB HOST";
static inline void _record_client_opened_device(client_t *client_obj, uint8_t dev_addr) static inline void _record_client_opened_device(client_t *client_obj, uint8_t dev_addr)
{ {
assert(dev_addr != 0); assert(dev_addr != 0 && dev_addr <= 127);
client_obj->dynamic.opened_dev_addr_map |= (1 << (dev_addr - 1)); client_obj->dynamic.opened_dev_addr_map[dev_addr / 32] |= (uint32_t)(1 << (dev_addr % 32));
} }
static inline void _clear_client_opened_device(client_t *client_obj, uint8_t dev_addr) static inline void _clear_client_opened_device(client_t *client_obj, uint8_t dev_addr)
{ {
assert(dev_addr != 0); assert(dev_addr != 0 && dev_addr <= 127);
client_obj->dynamic.opened_dev_addr_map &= ~(1 << (dev_addr - 1)); client_obj->dynamic.opened_dev_addr_map[dev_addr / 32] &= ~(uint32_t)(1 << (dev_addr % 32));
} }
static inline bool _check_client_opened_device(client_t *client_obj, uint8_t dev_addr) static inline bool _check_client_opened_device(client_t *client_obj, uint8_t dev_addr)
{ {
bool ret; bool ret;
assert(dev_addr <= 127);
if (dev_addr != 0) { if (dev_addr != 0) {
ret = client_obj->dynamic.opened_dev_addr_map & (1 << (dev_addr - 1)); ret = client_obj->dynamic.opened_dev_addr_map[dev_addr / 32] & (uint32_t)(1 << (dev_addr % 32));
} else { } else {
ret = false; ret = false;
} }
return ret; return ret;
} }
@ -820,7 +819,10 @@ esp_err_t usb_host_client_deregister(usb_host_client_handle_t client_hdl)
client_obj->dynamic.flags.taking_mux || client_obj->dynamic.flags.taking_mux ||
client_obj->dynamic.flags.num_intf_claimed != 0 || client_obj->dynamic.flags.num_intf_claimed != 0 ||
client_obj->dynamic.num_done_ctrl_xfer != 0 || client_obj->dynamic.num_done_ctrl_xfer != 0 ||
client_obj->dynamic.opened_dev_addr_map != 0) { client_obj->dynamic.opened_dev_addr_map[0] != 0 ||
client_obj->dynamic.opened_dev_addr_map[1] != 0 ||
client_obj->dynamic.opened_dev_addr_map[2] != 0 ||
client_obj->dynamic.opened_dev_addr_map[3] != 0) {
can_deregister = false; can_deregister = false;
} else { } else {
can_deregister = true; can_deregister = true;