diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-14 14:41:17 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-14 14:41:17 +0000 |
commit | 47f6a35013b2c6a370e5dce29aa6da3a96844695 (patch) | |
tree | 3f5842347a696c92beb74bc255c9489e6c38f49d /Demos/Host/LowLevel/MIDIHost | |
parent | e8570c4a37e41117e3fd1e989e0b41f1e9608f3c (diff) | |
download | lufa-47f6a35013b2c6a370e5dce29aa6da3a96844695.tar.gz lufa-47f6a35013b2c6a370e5dce29aa6da3a96844695.tar.bz2 lufa-47f6a35013b2c6a370e5dce29aa6da3a96844695.zip |
Reintegrate the FullEPAddresses development branch into trunk.
Diffstat (limited to 'Demos/Host/LowLevel/MIDIHost')
-rw-r--r-- | Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.c | 6 | ||||
-rw-r--r-- | Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.c b/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.c index 39e513cf6..70381ea56 100644 --- a/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.c +++ b/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.c @@ -105,12 +105,10 @@ uint8_t ProcessConfigurationDescriptor(void) } /* Configure the MIDI data IN pipe */ - Pipe_ConfigurePipe(MIDI_DATA_IN_PIPE, EP_TYPE_BULK, PIPE_TOKEN_IN, - DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize, PIPE_BANK_SINGLE); + Pipe_ConfigurePipe(MIDI_DATA_IN_PIPE, EP_TYPE_BULK, DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize, 1); /* Configure the MIDI data OUT pipe */ - Pipe_ConfigurePipe(MIDI_DATA_OUT_PIPE, EP_TYPE_BULK, PIPE_TOKEN_OUT, - DataOUTEndpoint->EndpointAddress, DataOUTEndpoint->EndpointSize, PIPE_BANK_SINGLE); + Pipe_ConfigurePipe(MIDI_DATA_OUT_PIPE, EP_TYPE_BULK, DataOUTEndpoint->EndpointAddress, DataOUTEndpoint->EndpointSize, 1); /* Valid data found, return success */ return SuccessfulConfigRead; diff --git a/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.h b/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.h index d41513e4e..40d4dc9cc 100644 --- a/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.h +++ b/Demos/Host/LowLevel/MIDIHost/ConfigDescriptor.h @@ -42,11 +42,11 @@ #include "MIDIHost.h" /* Macros: */ - /** Pipe number for the MIDI data IN pipe. */ - #define MIDI_DATA_IN_PIPE 1 + /** Pipe address for the MIDI data IN pipe. */ + #define MIDI_DATA_IN_PIPE (PIPE_DIR_IN | 1) - /** Pipe number for the MIDI data OUT pipe. */ - #define MIDI_DATA_OUT_PIPE 2 + /** Pipe address for the MIDI data OUT pipe. */ + #define MIDI_DATA_OUT_PIPE (PIPE_DIR_OUT | 2) /* Enums: */ /** Enum for the possible return codes of the \ref ProcessConfigurationDescriptor() function. */ |