Revert "Simplify logic"

This reverts commit 994e2f6b79.
This commit is contained in:
Eric Tang
2018-06-29 22:53:27 -07:00
parent 8f6251bc4d
commit d3dfc9bd2c
4 changed files with 20 additions and 12 deletions

View File

@@ -24,12 +24,14 @@ void ResetActiveUsbBasicKeyboardReport(void)
usb_status_t UsbBasicKeyboardAction(void) usb_status_t UsbBasicKeyboardAction(void)
{ {
SwitchActiveUsbBasicKeyboardReport(); // Switch the active report
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 *)ActiveUsbBasicKeyboardReport, 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) {
UsbBasicKeyboardActionCounter++; UsbBasicKeyboardActionCounter++;
SwitchActiveUsbBasicKeyboardReport(); } else {
SwitchActiveUsbBasicKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }

View File

@@ -22,12 +22,14 @@ void ResetActiveUsbMediaKeyboardReport(void)
usb_status_t UsbMediaKeyboardAction(void) usb_status_t UsbMediaKeyboardAction(void)
{ {
SwitchActiveUsbMediaKeyboardReport(); // Switch the active report
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 *)ActiveUsbMediaKeyboardReport, 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) {
UsbMediaKeyboardActionCounter++; UsbMediaKeyboardActionCounter++;
SwitchActiveUsbMediaKeyboardReport(); } else {
SwitchActiveUsbMediaKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }

View File

@@ -22,12 +22,14 @@ void ResetActiveUsbMouseReport(void)
usb_status_t UsbMouseAction(void) usb_status_t UsbMouseAction(void)
{ {
SwitchActiveUsbMouseReport(); // Switch the active report
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 *)ActiveUsbMouseReport, USB_MOUSE_REPORT_LENGTH); (uint8_t*)GetInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status == kStatus_USB_Success) {
UsbMouseActionCounter++; UsbMouseActionCounter++;
SwitchActiveUsbMouseReport(); } else {
SwitchActiveUsbMouseReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }

View File

@@ -22,12 +22,14 @@ void ResetActiveUsbSystemKeyboardReport(void)
usb_status_t UsbSystemKeyboardAction(void) usb_status_t UsbSystemKeyboardAction(void)
{ {
SwitchActiveUsbSystemKeyboardReport(); // Switch the active report
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 *)ActiveUsbSystemKeyboardReport, 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) {
UsbSystemKeyboardActionCounter++; UsbSystemKeyboardActionCounter++;
SwitchActiveUsbSystemKeyboardReport(); } else {
SwitchActiveUsbSystemKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }