diff options
Diffstat (limited to 'Demos/Device/KeyboardMouse/Descriptors.c')
| -rw-r--r-- | Demos/Device/KeyboardMouse/Descriptors.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Demos/Device/KeyboardMouse/Descriptors.c b/Demos/Device/KeyboardMouse/Descriptors.c index 2eb2c6e2e..6a9d75a7f 100644 --- a/Demos/Device/KeyboardMouse/Descriptors.c +++ b/Demos/Device/KeyboardMouse/Descriptors.c @@ -297,26 +297,26 @@ 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;
}
@@ -325,24 +325,24 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c case DTYPE_HID:
if (!(wIndex))
{
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID);
+ Address = (void*)&ConfigurationDescriptor.KeyboardHID;
Size = sizeof(USB_Descriptor_HID_t);
}
else
{
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.MouseHID);
+ Address = (void*)&ConfigurationDescriptor.MouseHID;
Size = sizeof(USB_Descriptor_HID_t);
}
break;
case DTYPE_Report:
if (!(wIndex))
{
- Address = DESCRIPTOR_ADDRESS(KeyboardReport);
+ Address = (void*)&KeyboardReport;
Size = sizeof(KeyboardReport);
}
else
{
- Address = DESCRIPTOR_ADDRESS(MouseReport);
+ Address = (void*)&MouseReport;
Size = sizeof(MouseReport);
}
|