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

Make sure we do not try to send another report before the old one has finished sending

Browse Source
This commit is contained in:
Kristian Sloth Lauszus
2018-06-23 17:33:20 +02:00
parent 14eb9c6ec0
commit 724378cf6c
5 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
right/src/usb_interfaces/usb_interface_basic_keyboard.c
View File

@@ -5,6 +5,7 @@ static usb_basic_keyboard_report_t usbBasicKeyboardReports[2];
uint32_t UsbBasicKeyboardActionCounter;
usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports;
static uint8_t usbBasicKeyboardInBuffer[USB_BASIC_KEYBOARD_REPORT_LENGTH];
static volatile bool sendUsbBasicKeyboardReportCompleted = true;
usb_basic_keyboard_report_t* GetInactiveUsbBasicKeyboardReport(void)
{
@@ -23,12 +24,17 @@ void ResetActiveUsbBasicKeyboardReport(void)
usb_status_t UsbBasicKeyboardAction(void)
{
if (!sendUsbBasicKeyboardReportCompleted)
return kStatus_USB_Busy; // The previous report has not been sent yet
UsbBasicKeyboardActionCounter++;
SwitchActiveUsbBasicKeyboardReport(); // Switch the active report
usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
(uint8_t*)ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success)
SwitchActiveUsbBasicKeyboardReport(); // Switch the active report if the data was sent successfully
(uint8_t*)GetInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) {
sendUsbBasicKeyboardReportCompleted = false;
}
return usb_status;
}
@@ -37,7 +43,12 @@ usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, voi
usb_status_t error = kStatus_USB_Error;
switch (event) {
// This report is received when the report has been sent
case kUSB_DeviceHidEventSendResponse:
sendUsbBasicKeyboardReportCompleted = true;
error = kStatus_USB_Success;
break;
case kUSB_DeviceHidEventRecvResponse:
case kUSB_DeviceHidEventGetReport:
error = kStatus_USB_InvalidRequest;
break;
@@ -57,7 +68,7 @@ usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, voi
report->reportBuffer = usbBasicKeyboardInBuffer;
error = kStatus_USB_Success;
} else {
error = kStatus_USB_InvalidRequest;
error = kStatus_USB_AllocFail;
}
break;
}