projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some minor whitespace corrections.
[pub/USBasp.git]
/
Demos
/
Device
/
LowLevel
/
AudioOutput
/
AudioOutput.c
diff --git
a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index
7a9c6ec
..
9661f03
100644
(file)
--- a/
Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/
Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@
-97,7
+97,7
@@
void EVENT_USB_Connect(void)
#if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))
\r
/* PWM speaker timer initialization */
\r
TCCRxA = ((1 << WGMx0) | (1 << COMxA1) | (1 << COMxA0)
\r
#if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))
\r
/* PWM speaker timer initialization */
\r
TCCRxA = ((1 << WGMx0) | (1 << COMxA1) | (1 << COMxA0)
\r
-
| (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP
\r
+ | (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP
\r
TCCRxB = ((1 << WGMx2) | (1 << CSx0)); // Fast 8-Bit PWM, Fcpu speed
\r
#endif
\r
}
\r
TCCRxB = ((1 << WGMx2) | (1 << CSx0)); // Fast 8-Bit PWM, Fcpu speed
\r
#endif
\r
}
\r
@@
-136,13
+136,16
@@
void EVENT_USB_Disconnect(void)
*/
\r
void EVENT_USB_ConfigurationChanged(void)
\r
{
\r
*/
\r
void EVENT_USB_ConfigurationChanged(void)
\r
{
\r
- /* Setup audio stream endpoint */
\r
- Endpoint_ConfigureEndpoint(AUDIO_STREAM_EPNUM, EP_TYPE_ISOCHRONOUS,
\r
- ENDPOINT_DIR_OUT, AUDIO_STREAM_EPSIZE,
\r
- ENDPOINT_BANK_DOUBLE);
\r
-
\r
/* Indicate USB connected and ready */
\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);
\r
/* Indicate USB connected and ready */
\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);
\r
+
\r
+ /* Setup audio stream endpoint */
\r
+ if (!(Endpoint_ConfigureEndpoint(AUDIO_STREAM_EPNUM, EP_TYPE_ISOCHRONOUS,
\r
+ ENDPOINT_DIR_OUT, AUDIO_STREAM_EPSIZE,
\r
+ ENDPOINT_BANK_DOUBLE)))
\r
+ {
\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
+ }
\r
}
\r
\r
/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific
\r
}
\r
\r
/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific
\r