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 /Demos/Device/MassStorage | |
| 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 'Demos/Device/MassStorage')
| -rw-r--r-- | Demos/Device/MassStorage/Descriptors.c | 12 | ||||
| -rw-r--r-- | Demos/Device/MassStorage/MassStorage.c | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Demos/Device/MassStorage/Descriptors.c b/Demos/Device/MassStorage/Descriptors.c index dbb16d1de..2351a0be2 100644 --- a/Demos/Device/MassStorage/Descriptors.c +++ b/Demos/Device/MassStorage/Descriptors.c @@ -187,30 +187,30 @@ 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;
case 0x03:
- Address = DESCRIPTOR_ADDRESS(SerialNumberString);
+ Address = (void*)&SerialNumberString;
Size = pgm_read_byte(&SerialNumberString.Header.Size);
break;
}
diff --git a/Demos/Device/MassStorage/MassStorage.c b/Demos/Device/MassStorage/MassStorage.c index c50ca3dde..1da8930b0 100644 --- a/Demos/Device/MassStorage/MassStorage.c +++ b/Demos/Device/MassStorage/MassStorage.c @@ -249,6 +249,11 @@ TASK(USB_MassStorage) /* Reset the data endpoint banks */
Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);
Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);
+
+ Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);
+ Endpoint_ClearStall();
+ Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
+ Endpoint_ClearStall();
/* Clear the abort transfer flag */
IsMassStoreReset = false;
|