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/Device/LowLevel/MIDI | |
| 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/Device/LowLevel/MIDI')
| -rw-r--r-- | Demos/Device/LowLevel/MIDI/Descriptors.c | 2 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MIDI/Descriptors.h | 8 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MIDI/MIDI.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.c b/Demos/Device/LowLevel/MIDI/Descriptors.c index 2d2b365aa..8e8746aa2 100644 --- a/Demos/Device/LowLevel/MIDI/Descriptors.c +++ b/Demos/Device/LowLevel/MIDI/Descriptors.c @@ -55,7 +55,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = .VendorID = 0x03EB, .ProductID = 0x2048, - .ReleaseNumber = 0x0000, + .ReleaseNumber = VERSION_BCD(00.01),, .ManufacturerStrIndex = 0x01, .ProductStrIndex = 0x02, diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.h b/Demos/Device/LowLevel/MIDI/Descriptors.h index b364c1b62..e110cc2e6 100644 --- a/Demos/Device/LowLevel/MIDI/Descriptors.h +++ b/Demos/Device/LowLevel/MIDI/Descriptors.h @@ -60,11 +60,11 @@ /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */ #define JACKTYPE_EXTERNAL 0x02 - /** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */ - #define MIDI_STREAM_OUT_EPNUM 1 - /** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */ - #define MIDI_STREAM_IN_EPNUM 2 + #define MIDI_STREAM_IN_EPNUM 1 + + /** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */ + #define MIDI_STREAM_OUT_EPNUM 2 /** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */ #define MIDI_STREAM_EPSIZE 64 diff --git a/Demos/Device/LowLevel/MIDI/MIDI.c b/Demos/Device/LowLevel/MIDI/MIDI.c index 5570dd16e..87ecbd4d0 100644 --- a/Demos/Device/LowLevel/MIDI/MIDI.c +++ b/Demos/Device/LowLevel/MIDI/MIDI.c @@ -94,10 +94,10 @@ void EVENT_USB_Device_ConfigurationChanged(void) bool ConfigSuccess = true; /* Setup MIDI Data Endpoints */ - ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT, - MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE); ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE); + ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT, + MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE); /* Indicate endpoint configuration success or failure */ LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR); |