diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-05-17 07:44:00 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-05-17 07:44:00 +0000 |
| commit | a74816480d92f683b2d11682d516f347a1a69301 (patch) | |
| tree | 6ab7cdb9e3ee3b56ae05d83f777ec304dd185cc5 /Projects | |
| parent | 829a7776bac40b95c3e82da58c5f913e10b71c82 (diff) | |
Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to obfuscate code.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@553 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/Magstripe/Descriptors.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c index dd6b3fb6..3d9dd08f 100644 --- a/Projects/Magstripe/Descriptors.c +++ b/Projects/Magstripe/Descriptors.c @@ -207,37 +207,37 @@ 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:
switch (DescriptorNumber)
{
case 0x00:
- Address = DESCRIPTOR_ADDRESS(LanguageString);
+ Address = (void*)&LanguageString;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
case 0x01:
- Address = DESCRIPTOR_ADDRESS(ManufacturerString);
+ Address = (void*)&ManufacturerString;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
case 0x02:
- Address = DESCRIPTOR_ADDRESS(ProductString);
+ Address = (void*)&ProductString;
Size = pgm_read_byte(&ProductString.Header.Size);
break;
}
break;
case DTYPE_HID:
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID);
+ Address = (void*)&ConfigurationDescriptor.KeyboardHID;
Size = sizeof(USB_Descriptor_HID_t);
break;
case DTYPE_Report:
- Address = DESCRIPTOR_ADDRESS(KeyboardReport);
+ Address = (void*)&KeyboardReport;
Size = sizeof(KeyboardReport);
break;
}
|