uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Just read the interruptInPipeBusy flag instead of storing the transfer state in a separate variable and switch the active report back if the HID Send command fails

Browse Source
This commit is contained in:
Kristian Sloth Lauszus
2018-06-24 17:13:47 +02:00
parent d1894fb62a
commit 64e5fa7ecb
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
right/src/usb_interfaces/usb_interface_system_keyboard.c
View File

@@ -3,7 +3,6 @@
uint32_t UsbSystemKeyboardActionCounter;
static usb_system_keyboard_report_t usbSystemKeyboardReports[2];
usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport = usbSystemKeyboardReports;
static volatile bool sendUsbSystemKeyboardReportCompleted = true;
usb_system_keyboard_report_t* GetInactiveUsbSystemKeyboardReport()
{
@@ -22,7 +21,7 @@ void ResetActiveUsbSystemKeyboardReport(void)
usb_status_t UsbSystemKeyboardAction(void)
{
if (!sendUsbSystemKeyboardReportCompleted)
if (((usb_device_hid_struct_t *)UsbCompositeDevice.systemKeyboardHandle)->interruptInPipeBusy)
return kStatus_USB_Busy; // The previous report has not been sent yet
UsbSystemKeyboardActionCounter++;
@@ -30,8 +29,8 @@ usb_status_t UsbSystemKeyboardAction(void)
usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) {
sendUsbSystemKeyboardReportCompleted = false;
if (usb_status != kStatus_USB_Success) {
SwitchActiveUsbSystemKeyboardReport(); // Switch back, as the command failed
}
return usb_status;
}
@@ -43,7 +42,6 @@ usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, vo
switch (event) {
// This report is received when the report has been sent
case kUSB_DeviceHidEventSendResponse:
sendUsbSystemKeyboardReportCompleted = true;
error = kStatus_USB_Success;
break;
case kUSB_DeviceHidEventRecvResponse: