diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-17 07:44:00 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-17 07:44:00 +0000 |
| commit | 72c2922e38a2dfd14eb2d8e3692171704b5508f4 (patch) | |
| tree | 6ab7cdb9e3ee3b56ae05d83f777ec304dd185cc5 /Bootloaders | |
| parent | eeba38e343a299e12964aec15fd43108d3dc9130 (diff) | |
| download | lufa-72c2922e38a2dfd14eb2d8e3692171704b5508f4.tar.gz lufa-72c2922e38a2dfd14eb2d8e3692171704b5508f4.tar.bz2 lufa-72c2922e38a2dfd14eb2d8e3692171704b5508f4.zip | |
Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to obfuscate code.
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/Descriptors.c | 8 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.c | 8 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/Descriptors.c | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index 11b2e375d..590b04130 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -220,22 +220,22 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c switch (DescriptorType)
{
case DTYPE_Device:
- Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);
+ Address = (void*)&DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t);
break;
case DTYPE_Configuration:
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);
+ Address = (void*)&ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_String:
if (!(DescriptorNumber))
{
- Address = DESCRIPTOR_ADDRESS(LanguageString);
+ Address = (void*)&LanguageString;
Size = LanguageString.Header.Size;
}
else
{
- Address = DESCRIPTOR_ADDRESS(ProductString);
+ Address = (void*)&ProductString;
Size = ProductString.Header.Size;
}
diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index 94f7404c6..cff3cd523 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -154,22 +154,22 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c switch (DescriptorType)
{
case DTYPE_Device:
- Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);
+ Address = &DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t);
break;
case DTYPE_Configuration:
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);
+ Address = &ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_String:
if (!(DescriptorNumber))
{
- Address = DESCRIPTOR_ADDRESS(LanguageString);
+ Address = &LanguageString;
Size = LanguageString.Header.Size;
}
else
{
- Address = DESCRIPTOR_ADDRESS(ProductString);
+ Address = &ProductString;
Size = ProductString.Header.Size;
}
diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c index b1642f16b..62e2d2111 100644 --- a/Bootloaders/TeensyHID/Descriptors.c +++ b/Bootloaders/TeensyHID/Descriptors.c @@ -183,32 +183,32 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c switch (DescriptorType)
{
case DTYPE_Device:
- Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);
+ Address = (void*)&DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t);
break;
case DTYPE_Configuration:
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);
+ Address = (void*)&ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_String:
if (!(DescriptorNumber))
{
- Address = DESCRIPTOR_ADDRESS(LanguageString);
+ Address = (void*)&LanguageString;
Size = LanguageString.Header.Size;
}
else
{
- Address = DESCRIPTOR_ADDRESS(ProductString);
+ Address = (void*)&ProductString;
Size = ProductString.Header.Size;
}
break;
case DTYPE_HID:
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.HIDDescriptor);
+ Address = (void*)&ConfigurationDescriptor.HIDDescriptor;
Size = sizeof(USB_Descriptor_HID_t);
break;
case DTYPE_Report:
- Address = DESCRIPTOR_ADDRESS(HIDReport);
+ Address = (void*)&HIDReport;
Size = sizeof(HIDReport);
break;
}
|