Skip to content

Fixed standalone locking bugs in HID host idle get/set #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fdesbiens merged 1 commit into from
Jun 4, 2026
Merged

Fixed standalone locking bugs in HID host idle get/set #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/usbx_host_classes/src/ux_host_class_hid_idle_get.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ UINT status;
UX_RESTORE
return(UX_BUSY);
}
hid -> ux_host_class_hid_flags &= ~UX_HOST_CLASS_HID_FLAG_LOCK;
hid -> ux_host_class_hid_flags |= UX_HOST_CLASS_HID_FLAG_LOCK;
UX_RESTORE
#else

Expand Down
49 changes: 34 additions & 15 deletions common/usbx_host_classes/src/ux_host_class_hid_idle_set.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,8 @@
UINT _ux_host_class_hid_idle_set(UX_HOST_CLASS_HID *hid, USHORT idle_time, USHORT report_id)
{
#if defined(UX_HOST_STANDALONE)
UINT status;
do
{
status = _ux_host_class_hid_idle_set_run(hid, idle_time, report_id);
} while(status == UX_STATE_WAIT || status == UX_STATE_LOCK);
return(hid -> ux_host_class_hid_status);
#else

UX_INTERRUPT_SAVE_AREA
#endif
UX_ENDPOINT *control_endpoint;
UX_TRANSFER *transfer_request;
UINT status;
Expand All @@ -99,24 +93,44 @@ UINT status;
transfer_request = &control_endpoint -> ux_endpoint_transfer_request;

/* Protect thread reentry to this instance. */
#if defined(UX_HOST_STANDALONE)
UX_DISABLE
if (hid -> ux_host_class_hid_flags & UX_HOST_CLASS_HID_FLAG_LOCK)
{
UX_RESTORE
return(UX_BUSY);
}
hid -> ux_host_class_hid_flags |= UX_HOST_CLASS_HID_FLAG_LOCK;
UX_RESTORE
#else
status = _ux_host_semaphore_get(&hid -> ux_host_class_hid_semaphore, UX_WAIT_FOREVER);
if (status != UX_SUCCESS)
return(status);

/* Protect the control endpoint semaphore here. It will be unprotected in the
transfer request function. */
status = _ux_host_semaphore_get(&hid -> ux_host_class_hid_device -> ux_device_protection_semaphore, UX_WAIT_FOREVER);

/* Check for status. */
if (status != UX_SUCCESS)
{

/* Something went wrong. */
/* Unprotect thread reentry to this instance. */
_ux_host_semaphore_put(&hid -> ux_host_class_hid_semaphore);

return(status);
}
#endif

#if defined(UX_HOST_STANDALONE)
/* Protect the control endpoint. It will be unprotected in the transfer request function. */
UX_DISABLE
if (hid -> ux_host_class_hid_device -> ux_device_flags & UX_DEVICE_FLAG_LOCK)
{
_ux_host_class_hid_unlock(hid);
UX_RESTORE
return(UX_BUSY);
}
hid -> ux_host_class_hid_device -> ux_device_flags |= UX_DEVICE_FLAG_LOCK;
transfer_request -> ux_transfer_request_flags |= UX_TRANSFER_FLAG_AUTO_DEVICE_UNLOCK;
UX_TRANSFER_STATE_RESET(transfer_request);
UX_RESTORE
#endif

/* Create a transfer request for the SET_IDLE request. */
transfer_request -> ux_transfer_request_data_pointer = UX_NULL;
Expand All @@ -129,12 +143,17 @@ UINT status;
/* Send request to HCD layer. */
status = _ux_host_stack_transfer_request(transfer_request);

#if defined(UX_HOST_STANDALONE)
if (!(transfer_request -> ux_transfer_request_flags & UX_TRANSFER_FLAG_AUTO_WAIT))
return(status);
_ux_host_class_hid_unlock(hid);
#else
/* Unprotect thread reentry to this instance. */
_ux_host_semaphore_put(&hid -> ux_host_class_hid_semaphore);
#endif

/* Return the function status. */
return(status);
#endif
}

/**************************************************************************/
Expand Down