diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-30 06:23:38 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-30 06:23:38 +0000 |
| commit | 158afe910947739b1df00000628c1e758bdf0812 (patch) | |
| tree | daf6fc80de05c9ed748599bc01c24b1578455dc2 /Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h | |
| parent | a509729b2d92b03a3d33ab0e1e1950ff65a96a09 (diff) | |
| download | lufa-158afe910947739b1df00000628c1e758bdf0812.tar.gz lufa-158afe910947739b1df00000628c1e758bdf0812.tar.bz2 lufa-158afe910947739b1df00000628c1e758bdf0812.zip | |
Reverted Endpoint/Pipe non-sequential configuration hack, placed restriction on the configuration order instead to ensure maximum reliability.
Altered all low level device and host mode demos to ensure that endpoints and pipes are configured in ascending order properly.
Rewrote all low level host mode demos' configuration descriptor parser code to ensure that pipes are enumerated in ascending order, and to ensure maximum compatibility with devices.
Incremented all device mode demo's device descriptor revision numbers to ensure that any descriptor changes are re-fetched on machines which have enumerated previous versions.
Diffstat (limited to 'Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h')
| -rw-r--r-- | Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h b/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h index fa24019ad..d75789192 100644 --- a/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h +++ b/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h @@ -51,6 +51,12 @@ /** Interface Protocol value for the Bulk Only transport protocol. */ #define MASS_STORE_PROTOCOL 0x50 + /** Pipe number of the Mass Storage data IN pipe. */ + #define MASS_STORE_DATA_IN_PIPE 1 + + /** Pipe number of the Mass Storage data OUT pipe. */ + #define MASS_STORE_DATA_OUT_PIPE 2 + /* Enums: */ /** Enum for the possible return codes of the \ref ProcessConfigurationDescriptor() function. */ enum MassStorageHost_GetConfigDescriptorDataCodes_t @@ -59,8 +65,7 @@ ControlError = 1, /**< A control request to the device failed to complete successfully */ DescriptorTooLarge = 2, /**< The device's Configuration Descriptor is too large to process */ InvalidConfigDataReturned = 3, /**< The device returned an invalid Configuration Descriptor */ - NoInterfaceFound = 4, /**< A compatible MSD interface was not found in the device's Configuration Descriptor */ - NoEndpointFound = 5, /**< The correct MSD endpoint descriptors were not found in the device's MSD interface */ + NoCompatibleInterfaceFound = 4, /**< A compatible interface with the required endpoints was not found */ }; /* Function Prototypes: */ |