From ce056ed2ca3c65d407b6efe83023efe29c1e8a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 29 Feb 2016 16:00:00 +0100 Subject: [PATCH] Extract UsbReceiveData() --- right/hid_generic.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/right/hid_generic.c b/right/hid_generic.c index 2a1faea..41be1d1 100644 --- a/right/hid_generic.c +++ b/right/hid_generic.c @@ -13,6 +13,12 @@ static usb_device_generic_hid_struct_t UsbGenericHidDevice; +static usb_status_t UsbReceiveData() { + return USB_DeviceHidRecv(UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID, + (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0], + USB_GENERIC_HID_OUT_BUFFER_LENGTH); +} + usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *param) { usb_status_t error = kStatus_USB_Error; @@ -42,9 +48,7 @@ usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void * (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0], USB_GENERIC_HID_OUT_BUFFER_LENGTH); UsbGenericHidDevice.bufferIndex ^= 1U; - return USB_DeviceHidRecv(UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID, - (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0], - USB_GENERIC_HID_OUT_BUFFER_LENGTH); + return UsbReceiveData(); break; case kUSB_DeviceHidEventGetReport: case kUSB_DeviceHidEventSetReport: @@ -66,10 +70,7 @@ usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void * usb_status_t UsbGenericHidSetConfiguration(class_handle_t handle, uint8_t configuration) { if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) { - return USB_DeviceHidRecv( - UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID, - (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0], - USB_GENERIC_HID_OUT_BUFFER_LENGTH); + return UsbReceiveData(); } return kStatus_USB_Error; } @@ -78,10 +79,7 @@ usb_status_t UsbGenericHidSetInterface(class_handle_t handle, uint8_t interface, { if (USB_KEYBOARD_INTERFACE_INDEX == interface) { UsbCompositeDevice.currentInterfaceAlternateSetting[interface] = alternateSetting; - return USB_DeviceHidRecv( - UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID, - (uint8_t *)&UsbGenericHidDevice.buffer[UsbGenericHidDevice.bufferIndex][0], - USB_GENERIC_HID_OUT_BUFFER_LENGTH); + return UsbReceiveData(); } return kStatus_USB_Error; }