From 0becc0c51cfd86c2cc1d16c0ccd5bce94a64f08c Mon Sep 17 00:00:00 2001 From: Christina Quast Date: Sat, 4 Apr 2015 13:04:06 +0200 Subject: [PATCH] Fixed compiler warn: USB descriptor array elements The compiler warning: simtrace/usb.c:553:5: warning: initialization from incompatible pointer type [enabled by default] &configurationDescriptorSniffer, ^ simtrace/usb.c:553:5: warning: (near initialization for 'configurationDescriptorsArr[0]') [enabled by default] simtrace/usb.c:554:5: warning: initialization from incompatible pointer type [enabled by default] &configurationDescriptorCCID, ^ simtrace/usb.c:554:5: warning: (near initialization for 'configurationDescriptorsArr[1]') [enabled by default] simtrace/usb.c:555:5: warning: initialization from incompatible pointer type [enabled by default] &configurationDescriptorPhone, ^ simtrace/usb.c:555:5: warning: (near initialization for 'configurationDescriptorsArr[2]') [enabled by default] simtrace/usb.c:556:5: warning: initialization from incompatible pointer type [enabled by default] &configurationDescriptorMITM, ^ simtrace/usb.c:556:5: warning: (near initialization for 'configurationDescriptorsArr[3]') [enabled by default] simtrace/usb.c: In function 'getConfigDesc': simtrace/usb.c:560:5: warning: return discards 'const' qualifier from pointer target type [enabled by default] return configurationDescriptorsArr[idx]; ^ simtrace/usb.c: At top level: --- sam3s_example/simtrace/usb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sam3s_example/simtrace/usb.c b/sam3s_example/simtrace/usb.c index 48b2b5d0..f91c80c5 100644 --- a/sam3s_example/simtrace/usb.c +++ b/sam3s_example/simtrace/usb.c @@ -550,10 +550,10 @@ const USBDeviceDescriptor deviceDescriptor = { }; const USBConfigurationDescriptor *configurationDescriptorsArr[] = { - &configurationDescriptorSniffer, - &configurationDescriptorCCID, - &configurationDescriptorPhone, - &configurationDescriptorMITM, + &configurationDescriptorSniffer.configuration, + &configurationDescriptorCCID.configuration, + &configurationDescriptorPhone.configuration, + &configurationDescriptorMITM.configuration, }; USBConfigurationDescriptor *getConfigDesc(uint8_t idx) {