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_basic_keyboard.c
View File

@@ -5,7 +5,6 @@ static usb_basic_keyboard_report_t usbBasicKeyboardReports[2];
uint32_t UsbBasicKeyboardActionCounter; uint32_t UsbBasicKeyboardActionCounter;
usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports; usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports;
static uint8_t usbBasicKeyboardInBuffer[USB_BASIC_KEYBOARD_REPORT_LENGTH]; static uint8_t usbBasicKeyboardInBuffer[USB_BASIC_KEYBOARD_REPORT_LENGTH];
static volatile bool sendUsbBasicKeyboardReportCompleted = true;
usb_basic_keyboard_report_t* GetInactiveUsbBasicKeyboardReport(void) usb_basic_keyboard_report_t* GetInactiveUsbBasicKeyboardReport(void)
{ {
@@ -24,7 +23,7 @@ void ResetActiveUsbBasicKeyboardReport(void)
usb_status_t UsbBasicKeyboardAction(void) usb_status_t UsbBasicKeyboardAction(void)
{ {
if (!sendUsbBasicKeyboardReportCompleted) if (((usb_device_hid_struct_t *)UsbCompositeDevice.basicKeyboardHandle)->interruptInPipeBusy)
return kStatus_USB_Busy; // The previous report has not been sent yet return kStatus_USB_Busy; // The previous report has not been sent yet
UsbBasicKeyboardActionCounter++; UsbBasicKeyboardActionCounter++;
@@ -32,8 +31,8 @@ usb_status_t UsbBasicKeyboardAction(void)
usb_status_t usb_status = USB_DeviceHidSend( usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX, UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH); (uint8_t*)GetInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status != kStatus_USB_Success) {
sendUsbBasicKeyboardReportCompleted = false; SwitchActiveUsbBasicKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }
@@ -45,7 +44,6 @@ usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, voi
switch (event) { switch (event) {
// This report is received when the report has been sent // This report is received when the report has been sent
case kUSB_DeviceHidEventSendResponse: case kUSB_DeviceHidEventSendResponse:
sendUsbBasicKeyboardReportCompleted = true;
error = kStatus_USB_Success; error = kStatus_USB_Success;
break; break;
case kUSB_DeviceHidEventRecvResponse: case kUSB_DeviceHidEventRecvResponse:

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

@@ -3,7 +3,6 @@
uint32_t UsbMediaKeyboardActionCounter; uint32_t UsbMediaKeyboardActionCounter;
static usb_media_keyboard_report_t usbMediaKeyboardReports[2]; static usb_media_keyboard_report_t usbMediaKeyboardReports[2];
usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports; usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports;
static volatile bool sendUsbMediaKeyboardReportCompleted = true;
usb_media_keyboard_report_t* GetInactiveUsbMediaKeyboardReport(void) usb_media_keyboard_report_t* GetInactiveUsbMediaKeyboardReport(void)
{ {
@@ -22,7 +21,7 @@ void ResetActiveUsbMediaKeyboardReport(void)
usb_status_t UsbMediaKeyboardAction() usb_status_t UsbMediaKeyboardAction()
{ {
if (!sendUsbMediaKeyboardReportCompleted) if (((usb_device_hid_struct_t *)UsbCompositeDevice.mediaKeyboardHandle)->interruptInPipeBusy)
return kStatus_USB_Busy; // The previous report has not been sent yet return kStatus_USB_Busy; // The previous report has not been sent yet
UsbMediaKeyboardActionCounter++; UsbMediaKeyboardActionCounter++;
@@ -30,8 +29,8 @@ usb_status_t UsbMediaKeyboardAction()
usb_status_t usb_status = USB_DeviceHidSend( usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX, UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH); (uint8_t*)GetInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status != kStatus_USB_Success) {
sendUsbMediaKeyboardReportCompleted = false; SwitchActiveUsbMediaKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }
@@ -43,7 +42,6 @@ usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, voi
switch (event) { switch (event) {
// This report is received when the report has been sent // This report is received when the report has been sent
case kUSB_DeviceHidEventSendResponse: case kUSB_DeviceHidEventSendResponse:
sendUsbMediaKeyboardReportCompleted = true;
error = kStatus_USB_Success; error = kStatus_USB_Success;
break; break;
case kUSB_DeviceHidEventRecvResponse: case kUSB_DeviceHidEventRecvResponse:

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

@@ -3,7 +3,6 @@
uint32_t UsbMouseActionCounter; uint32_t UsbMouseActionCounter;
static usb_mouse_report_t usbMouseReports[2]; static usb_mouse_report_t usbMouseReports[2];
usb_mouse_report_t* ActiveUsbMouseReport = usbMouseReports; usb_mouse_report_t* ActiveUsbMouseReport = usbMouseReports;
volatile bool sendUsbMouseReportCompleted = true;
usb_mouse_report_t* GetInactiveUsbMouseReport(void) usb_mouse_report_t* GetInactiveUsbMouseReport(void)
{ {
@@ -22,7 +21,7 @@ void ResetActiveUsbMouseReport(void)
usb_status_t usbMouseAction(void) usb_status_t usbMouseAction(void)
{ {
if (!sendUsbMouseReportCompleted) if (((usb_device_hid_struct_t *)UsbCompositeDevice.mouseHandle)->interruptInPipeBusy)
return kStatus_USB_Busy; // The previous report has not been sent yet return kStatus_USB_Busy; // The previous report has not been sent yet
UsbMouseActionCounter++; UsbMouseActionCounter++;
@@ -30,8 +29,8 @@ usb_status_t usbMouseAction(void)
usb_status_t usb_status = USB_DeviceHidSend( usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX, UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH); (uint8_t*)GetInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status != kStatus_USB_Success) {
sendUsbMouseReportCompleted = false; SwitchActiveUsbMouseReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }
@@ -43,7 +42,6 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param
switch (event) { switch (event) {
// This report is received when the report has been sent // This report is received when the report has been sent
case kUSB_DeviceHidEventSendResponse: case kUSB_DeviceHidEventSendResponse:
sendUsbMouseReportCompleted = true;
error = kStatus_USB_Success; error = kStatus_USB_Success;
break; break;
case kUSB_DeviceHidEventRecvResponse: case kUSB_DeviceHidEventRecvResponse:

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

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