From 934a3c6f4fdf9c5e8fda1f79abbd78b48abd502a Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 31 Jul 2011 19:54:27 +0200
Subject: USBD multi-conf: Fix non-highspeed case

---
 at91lib/usb/device/ccid/cciddriver.c                        | 6 +++---
 at91lib/usb/device/cdc-serial/CDCDSerialDriverDescriptors.c | 6 +++---
 at91lib/usb/device/composite/COMPOSITEDDriverDescriptors.c  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/at91lib/usb/device/ccid/cciddriver.c b/at91lib/usb/device/ccid/cciddriver.c
index 3db9065..5a44d02 100644
--- a/at91lib/usb/device/ccid/cciddriver.c
+++ b/at91lib/usb/device/ccid/cciddriver.c
@@ -607,11 +607,11 @@ const USBDDriverDescriptors ccidDriverDescriptors = {
     { (USBConfigurationDescriptor *) &sOtherSpeedConfigurationHS },
 #else
     0, // No qualifier descriptor FS
-    0, // No other-speed configuration FS
+    { 0 }, // No other-speed configuration FS
     0, // No device descriptor HS
-    0, // No configuration HS
+    { 0 }, // No configuration HS
     0, // No qualifier descriptor HS
-    0, // No other-speed configuration HS
+    { 0 }, // No other-speed configuration HS
 #endif
     stringDescriptors,
     4+DFU_NUM_STRINGS // Four string descriptors in array
diff --git a/at91lib/usb/device/cdc-serial/CDCDSerialDriverDescriptors.c b/at91lib/usb/device/cdc-serial/CDCDSerialDriverDescriptors.c
index dd3f38e..7df769e 100644
--- a/at91lib/usb/device/cdc-serial/CDCDSerialDriverDescriptors.c
+++ b/at91lib/usb/device/cdc-serial/CDCDSerialDriverDescriptors.c
@@ -618,11 +618,11 @@ USBDDriverDescriptors cdcdSerialDriverDescriptors = {
     { (USBConfigurationDescriptor *) &(otherSpeedDescriptorsHS) },
 #else
     0, // No full-speed device qualifier descriptor
-    0, // No full-speed other speed configuration
+    { 0 }, // No full-speed other speed configuration
     0, // No high-speed device descriptor
-    0, // No high-speed configuration descriptor
+    { 0 }, // No high-speed configuration descriptor
     0, // No high-speed device qualifier descriptor
-    0, // No high-speed other speed configuration descriptor
+    { 0 }, // No high-speed other speed configuration descriptor
 
 #endif
     stringDescriptors,
diff --git a/at91lib/usb/device/composite/COMPOSITEDDriverDescriptors.c b/at91lib/usb/device/composite/COMPOSITEDDriverDescriptors.c
index 3229385..50a3cdf 100644
--- a/at91lib/usb/device/composite/COMPOSITEDDriverDescriptors.c
+++ b/at91lib/usb/device/composite/COMPOSITEDDriverDescriptors.c
@@ -893,7 +893,7 @@ const USBDDriverDescriptors compositedDriverDescriptors = {
     &qualifierDescriptor,
     { (const USBConfigurationDescriptor *) &configurationDescriptors },
 #else
-    0, 0, 0, 0, 0, 0,
+    0, { 0 }, 0, { 0 }, 0, { 0 },
 #endif
     stringDescriptors,
     4 // Number of string descriptors
-- 
cgit v1.2.3