From 44234f15ca4fa4490f712199d5aa079386d20d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 29 Feb 2016 15:43:37 +0100 Subject: [PATCH] Rename Usb*SetConfigure() to Usb*SetConfiguration() --- right/composite.c | 6 +++--- right/hid_generic.c | 2 +- right/hid_generic.h | 2 +- right/hid_keyboard.c | 2 +- right/hid_keyboard.h | 2 +- right/hid_mouse.c | 2 +- right/hid_mouse.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/right/composite.c b/right/composite.c index 4062572..5842a0c 100644 --- a/right/composite.c +++ b/right/composite.c @@ -54,9 +54,9 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, case kUSB_DeviceEventSetConfiguration: UsbCompositeDevice.attach = 1U; UsbCompositeDevice.currentConfiguration = *temp8; - UsbMouseSetConfigure(UsbCompositeDevice.mouseHandle, *temp8); - UsbKeyboardSetConfigure(UsbCompositeDevice.keyboardHandle, *temp8); - UsbGenericHidSetConfigure(UsbCompositeDevice.keyboardHandle, *temp8); + UsbMouseSetConfiguration(UsbCompositeDevice.mouseHandle, *temp8); + UsbKeyboardSetConfiguration(UsbCompositeDevice.keyboardHandle, *temp8); + UsbGenericHidSetConfiguration(UsbCompositeDevice.keyboardHandle, *temp8); error = kStatus_USB_Success; break; case kUSB_DeviceEventGetConfiguration: diff --git a/right/hid_generic.c b/right/hid_generic.c index 5cf8477..0a2f10f 100644 --- a/right/hid_generic.c +++ b/right/hid_generic.c @@ -62,7 +62,7 @@ usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void * return error; } -usb_status_t UsbGenericHidSetConfigure(class_handle_t handle, uint8_t configuration) +usb_status_t UsbGenericHidSetConfiguration(class_handle_t handle, uint8_t configuration) { if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) { return USB_DeviceHidRecv( diff --git a/right/hid_generic.h b/right/hid_generic.h index 8876cfa..1d985b7 100644 --- a/right/hid_generic.h +++ b/right/hid_generic.h @@ -17,7 +17,7 @@ // Functions: extern usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *param); - extern usb_status_t UsbGenericHidSetConfigure(class_handle_t handle, uint8_t configuration); + extern usb_status_t UsbGenericHidSetConfiguration(class_handle_t handle, uint8_t configuration); extern usb_status_t UsbGenericHidSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); #endif diff --git a/right/hid_keyboard.c b/right/hid_keyboard.c index 3e12db1..529c165 100644 --- a/right/hid_keyboard.c +++ b/right/hid_keyboard.c @@ -50,7 +50,7 @@ usb_status_t UsbKeyboardCallback(class_handle_t handle, uint32_t event, void *pa return error; } -usb_status_t UsbKeyboardSetConfigure(class_handle_t handle, uint8_t configuration) +usb_status_t UsbKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration) { if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) { return UsbKeyboardAction(); diff --git a/right/hid_keyboard.h b/right/hid_keyboard.h index 57d2072..2fa7db6 100644 --- a/right/hid_keyboard.h +++ b/right/hid_keyboard.h @@ -15,7 +15,7 @@ // Functions: extern usb_status_t UsbKeyboardCallback(class_handle_t handle, uint32_t event, void *param); - extern usb_status_t UsbKeyboardSetConfigure(class_handle_t handle, uint8_t configuration); + extern usb_status_t UsbKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration); extern usb_status_t UsbKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); #endif diff --git a/right/hid_mouse.c b/right/hid_mouse.c index f4eda37..8367115 100644 --- a/right/hid_mouse.c +++ b/right/hid_mouse.c @@ -51,7 +51,7 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param return error; } -usb_status_t UsbMouseSetConfigure(class_handle_t handle, uint8_t configuration) +usb_status_t UsbMouseSetConfiguration(class_handle_t handle, uint8_t configuration) { if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) { return UsbMouseAction(); diff --git a/right/hid_mouse.h b/right/hid_mouse.h index 0d9b26d..01b04e8 100644 --- a/right/hid_mouse.h +++ b/right/hid_mouse.h @@ -15,7 +15,7 @@ // Functions: extern usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param); - extern usb_status_t UsbMouseSetConfigure(class_handle_t handle, uint8_t configuration); + extern usb_status_t UsbMouseSetConfiguration(class_handle_t handle, uint8_t configuration); extern usb_status_t UsbMouseSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); #endif