From e9bf3dc355eeeebbf6f7c8899c891d907d9ecefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Mon, 4 Dec 2017 20:05:28 +0100
Subject: [PATCH] Expand UsbDeviceCompositeClassConfig and
 UsbDeviceCompositeConfigList using structure member names.

---
 right/src/usb_composite_device.c | 36 +++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c
index 2740844..34bab3f 100644
--- a/right/src/usb_composite_device.c
+++ b/right/src/usb_composite_device.c
@@ -9,17 +9,37 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event,
 usb_composite_device_t UsbCompositeDevice;
 
 usb_device_class_config_struct_t UsbDeviceCompositeClassConfig[USB_DEVICE_CONFIG_HID] = {
-    {UsbGenericHidCallback,     (class_handle_t)NULL, &UsbGenericHidClass},
-    {UsbBasicKeyboardCallback,  (class_handle_t)NULL, &UsbBasicKeyboardClass},
-    {UsbMediaKeyboardCallback,  (class_handle_t)NULL, &UsbMediaKeyboardClass},
-    {UsbSystemKeyboardCallback, (class_handle_t)NULL, &UsbSystemKeyboardClass},
-    {UsbMouseCallback,          (class_handle_t)NULL, &UsbMouseClass},
+    {
+        .classCallback = UsbGenericHidCallback,
+        .classHandle = (class_handle_t)NULL,
+        .classInfomation = &UsbGenericHidClass
+    },
+    {
+        .classCallback = UsbBasicKeyboardCallback,
+        .classHandle = (class_handle_t)NULL,
+        .classInfomation = &UsbBasicKeyboardClass
+    },
+    {
+        .classCallback = UsbMediaKeyboardCallback,
+        .classHandle = (class_handle_t)NULL,
+        .classInfomation = &UsbMediaKeyboardClass
+    },
+    {
+        .classCallback = UsbSystemKeyboardCallback,
+        .classHandle = (class_handle_t)NULL,
+        .classInfomation = &UsbSystemKeyboardClass
+    },
+    {
+        .classCallback = UsbMouseCallback,
+        .classHandle = (class_handle_t)NULL,
+        .classInfomation = &UsbMouseClass
+    },
 };
 
 usb_device_class_config_list_struct_t UsbDeviceCompositeConfigList = {
-    UsbDeviceCompositeClassConfig,
-    UsbDeviceCallback,
-    USB_DEVICE_CONFIG_HID
+    .deviceCallback = UsbDeviceCallback,
+    .count = USB_DEVICE_CONFIG_HID,
+    .config = UsbDeviceCompositeClassConfig,
 };
 
 static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param)