Added new callback to the Audio Class driver to allow for endpoint control manipulati...

[pub/lufa.git] / Demos / Host / Incomplete / AudioInputHost / AudioInputHost.c

diff --git a/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c b/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c
index 7ac8f00..6fe869c 100644 (file)
--- a/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c
+++ b/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c
@@ -43,7 +43,7 @@ int main(void)
 {\r
        SetupHardware();\r
 \r
 {\r
        SetupHardware();\r
 \r

-       puts_P(PSTR(ESC_FG_CYAN "Audio Host Demo running.\r\n" ESC_FG_WHITE));\r
+       puts_P(PSTR(ESC_FG_CYAN "Audio Input Host Demo running.\r\n" ESC_FG_WHITE));\r

 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
        sei();\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
        sei();\r


@@ -208,7 +208,7 @@ void Audio_Task(void)
        \r
                        /* Sample reload timer initialization */\r
                        TIMSK0  = (1 << OCIE0A);\r
        \r
                        /* Sample reload timer initialization */\r
                        TIMSK0  = (1 << OCIE0A);\r

-                       OCR0A   = ((F_CPU / 8 / 8000) - 1);\r
+                       OCR0A   = ((F_CPU / 8 / 48000) - 1);\r

                        TCCR0A  = (1 << WGM01);  // CTC mode\r
                        TCCR0B  = (1 << CS01);   // Fcpu/8 speed        \r
 \r
                        TCCR0A  = (1 << WGM01);  // CTC mode\r
                        TCCR0B  = (1 << CS01);   // Fcpu/8 speed        \r
 \r


@@ -216,8 +216,7 @@ void Audio_Task(void)
                        DDRC   |= (1 << 6);\r
 \r
                        /* PWM speaker timer initialization */\r
                        DDRC   |= (1 << 6);\r
 \r
                        /* PWM speaker timer initialization */\r

-                       TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)\r
-                                       | (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP\r
+                       TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP\r

                        TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, F_CPU speed\r
                        \r
                        puts_P(PSTR("Microphone Enumerated.\r\n"));\r
                        TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, F_CPU speed\r
                        \r
                        puts_P(PSTR("Microphone Enumerated.\r\n"));\r


@@ -225,6 +224,7 @@ void Audio_Task(void)
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r

+                       /* Do nothing - audio stream is handled by the timer interrupt routine */\r

                        break;\r
        }\r
 }\r
                        break;\r
        }\r
 }\r


@@ -269,6 +269,5 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
        }\r
        \r
        Pipe_Freeze();\r
        }\r
        \r
        Pipe_Freeze();\r

-\r

        Pipe_SelectPipe(PrevPipe);\r
 }\r
        Pipe_SelectPipe(PrevPipe);\r
 }\r