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:
This commit is contained in:
Christina Quast
2015-04-04 13:04:06 +02:00
parent b65b881de1
commit 0becc0c51c

View File

@@ -550,10 +550,10 @@ const USBDeviceDescriptor deviceDescriptor = {
}; };
const USBConfigurationDescriptor *configurationDescriptorsArr[] = { const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
&configurationDescriptorSniffer, &configurationDescriptorSniffer.configuration,
&configurationDescriptorCCID, &configurationDescriptorCCID.configuration,
&configurationDescriptorPhone, &configurationDescriptorPhone.configuration,
&configurationDescriptorMITM, &configurationDescriptorMITM.configuration,
}; };
USBConfigurationDescriptor *getConfigDesc(uint8_t idx) { USBConfigurationDescriptor *getConfigDesc(uint8_t idx) {