Remove redundant guard clauses
This commit is contained in:
@@ -23,15 +23,13 @@ void ResetActiveUsbBasicKeyboardReport(void)
|
|||||||
|
|
||||||
usb_status_t UsbBasicKeyboardAction(void)
|
usb_status_t UsbBasicKeyboardAction(void)
|
||||||
{
|
{
|
||||||
if (((usb_device_hid_struct_t *)UsbCompositeDevice.basicKeyboardHandle)->interruptInPipeBusy)
|
|
||||||
return kStatus_USB_Busy; // The previous report has not been sent yet
|
|
||||||
|
|
||||||
UsbBasicKeyboardActionCounter++;
|
|
||||||
SwitchActiveUsbBasicKeyboardReport(); // Switch the active report
|
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*)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) {
|
||||||
|
UsbBasicKeyboardActionCounter++;
|
||||||
|
} else {
|
||||||
SwitchActiveUsbBasicKeyboardReport(); // Switch back, as the command failed
|
SwitchActiveUsbBasicKeyboardReport(); // Switch back, as the command failed
|
||||||
}
|
}
|
||||||
return usb_status;
|
return usb_status;
|
||||||
|
|||||||
@@ -21,15 +21,13 @@ void ResetActiveUsbMediaKeyboardReport(void)
|
|||||||
|
|
||||||
usb_status_t UsbMediaKeyboardAction(void)
|
usb_status_t UsbMediaKeyboardAction(void)
|
||||||
{
|
{
|
||||||
if (((usb_device_hid_struct_t *)UsbCompositeDevice.mediaKeyboardHandle)->interruptInPipeBusy)
|
|
||||||
return kStatus_USB_Busy; // The previous report has not been sent yet
|
|
||||||
|
|
||||||
UsbMediaKeyboardActionCounter++;
|
|
||||||
SwitchActiveUsbMediaKeyboardReport(); // Switch the active report
|
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*)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) {
|
||||||
|
UsbMediaKeyboardActionCounter++;
|
||||||
|
} else {
|
||||||
SwitchActiveUsbMediaKeyboardReport(); // Switch back, as the command failed
|
SwitchActiveUsbMediaKeyboardReport(); // Switch back, as the command failed
|
||||||
}
|
}
|
||||||
return usb_status;
|
return usb_status;
|
||||||
|
|||||||
@@ -21,15 +21,13 @@ void ResetActiveUsbMouseReport(void)
|
|||||||
|
|
||||||
usb_status_t usbMouseAction(void)
|
usb_status_t usbMouseAction(void)
|
||||||
{
|
{
|
||||||
if (((usb_device_hid_struct_t *)UsbCompositeDevice.mouseHandle)->interruptInPipeBusy)
|
|
||||||
return kStatus_USB_Busy; // The previous report has not been sent yet
|
|
||||||
|
|
||||||
UsbMouseActionCounter++;
|
|
||||||
SwitchActiveUsbMouseReport(); // Switch the active report
|
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*)GetInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
|
(uint8_t*)GetInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
|
||||||
if (usb_status != kStatus_USB_Success) {
|
if (usb_status == kStatus_USB_Success) {
|
||||||
|
UsbMouseActionCounter++;
|
||||||
|
} else {
|
||||||
SwitchActiveUsbMouseReport(); // Switch back, as the command failed
|
SwitchActiveUsbMouseReport(); // Switch back, as the command failed
|
||||||
}
|
}
|
||||||
return usb_status;
|
return usb_status;
|
||||||
|
|||||||
@@ -21,15 +21,13 @@ void ResetActiveUsbSystemKeyboardReport(void)
|
|||||||
|
|
||||||
usb_status_t UsbSystemKeyboardAction(void)
|
usb_status_t UsbSystemKeyboardAction(void)
|
||||||
{
|
{
|
||||||
if (((usb_device_hid_struct_t *)UsbCompositeDevice.systemKeyboardHandle)->interruptInPipeBusy)
|
|
||||||
return kStatus_USB_Busy; // The previous report has not been sent yet
|
|
||||||
|
|
||||||
UsbSystemKeyboardActionCounter++;
|
|
||||||
SwitchActiveUsbSystemKeyboardReport(); // Switch the active report
|
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*)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) {
|
||||||
|
UsbSystemKeyboardActionCounter++;
|
||||||
|
} else {
|
||||||
SwitchActiveUsbSystemKeyboardReport(); // Switch back, as the command failed
|
SwitchActiveUsbSystemKeyboardReport(); // Switch back, as the command failed
|
||||||
}
|
}
|
||||||
return usb_status;
|
return usb_status;
|
||||||
|
|||||||
Reference in New Issue
Block a user