diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-06 09:43:09 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-06 09:43:09 +0000 |
| commit | 1a25b6f5f1b9735c44090a27f2925da51ddcc67b (patch) | |
| tree | b146adf09529cb89ef52867ec564583944c42111 /Demos/Device/ClassDriver | |
| parent | 7dffa15c1670806cc053b9930f341b53e30f7384 (diff) | |
| download | lufa-1a25b6f5f1b9735c44090a27f2925da51ddcc67b.tar.gz lufa-1a25b6f5f1b9735c44090a27f2925da51ddcc67b.tar.bz2 lufa-1a25b6f5f1b9735c44090a27f2925da51ddcc67b.zip | |
Update the Low Level Audio Input and Audio Output demos to support multiple sample rates.
Remove custom PIDs on the Class Driver Audio device demos and revert back to the original Audio PIDs, as the low level and class driver demo versions are now descriptor compatible once again.
Diffstat (limited to 'Demos/Device/ClassDriver')
4 files changed, 6 insertions, 6 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c index 58a3668e8..1acf20de8 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c @@ -52,7 +52,7 @@ USB_ClassInfo_Audio_Device_t Microphone_Audio_Interface = }; /** Current audio sampling frequency of the streaming audio endpoint. */ -uint32_t CurrentAudioSampleFrequency = 48000; +static uint32_t CurrentAudioSampleFrequency = 48000; /** Main program entry point. This routine contains the overall program flow, including initial diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c index 6fffd05d4..0d1f0e03e 100644 --- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c @@ -54,8 +54,8 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, .VendorID = 0x03EB, - .ProductID = 0x206B, - .ReleaseNumber = VERSION_BCD(00.01), + .ProductID = 0x2047, + .ReleaseNumber = VERSION_BCD(00.02), .ManufacturerStrIndex = 0x01, .ProductStrIndex = 0x02, diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c index 43267b2a7..77727f05e 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c @@ -52,7 +52,7 @@ USB_ClassInfo_Audio_Device_t Speaker_Audio_Interface = }; /** Current audio sampling frequency of the streaming audio endpoint. */ -uint32_t CurrentAudioSampleFrequency = 48000; +static uint32_t CurrentAudioSampleFrequency = 48000; /** Main program entry point. This routine contains the overall program flow, including initial diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c index 5bb0e9f11..606d80b2b 100644 --- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c @@ -54,8 +54,8 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, .VendorID = 0x03EB, - .ProductID = 0x206C, - .ReleaseNumber = VERSION_BCD(00.01), + .ProductID = 0x2046, + .ReleaseNumber = VERSION_BCD(00.02), .ManufacturerStrIndex = 0x01, .ProductStrIndex = 0x02, |