Fixed incorrect reponse to GET STATUS requests in device mode if NO_DEVICE_SELF_POWER...

[pub/USBasp.git] / Demos / Host / LowLevel / AudioInputHost / AudioInputHost.c

diff --git a/Demos/Host/LowLevel/AudioInputHost/AudioInputHost.c b/Demos/Host/LowLevel/AudioInputHost/AudioInputHost.c
index 97a18a0..a7332fb 100644 (file)
--- a/Demos/Host/LowLevel/AudioInputHost/AudioInputHost.c
+++ b/Demos/Host/LowLevel/AudioInputHost/AudioInputHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -123,7 +123,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                return;
        }
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                return;
        }

-       
+

        if ((ErrorCode = USB_Host_SetInterfaceAltSetting(StreamingInterfaceIndex,
                                                         StreamingInterfaceAltSetting)) != HOST_SENDCONTROL_Successful)
        {
        if ((ErrorCode = USB_Host_SetInterfaceAltSetting(StreamingInterfaceIndex,
                                                         StreamingInterfaceAltSetting)) != HOST_SENDCONTROL_Successful)
        {


@@ -143,7 +143,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
                        .wIndex        = StreamingEndpointAddress,
                        .wLength       = sizeof(USB_Audio_SampleFreq_t),
                };
                        .wIndex        = StreamingEndpointAddress,
                        .wLength       = sizeof(USB_Audio_SampleFreq_t),
                };

-               
+

        USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);
 
        /* Select the control pipe for the request transfer */
        USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);
 
        /* Select the control pipe for the request transfer */


@@ -153,7 +153,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
        if ((ErrorCode = USB_Host_SendControlRequest(&SampleRate)) != HOST_SENDCONTROL_Successful)
        {
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
        if ((ErrorCode = USB_Host_SendControlRequest(&SampleRate)) != HOST_SENDCONTROL_Successful)
        {
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-               USB_Host_SetDeviceConfiguration(0);             
+               USB_Host_SetDeviceConfiguration(0);

                return;
        }
 
                return;
        }
 


@@ -161,7 +161,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
        TIMSK0  = (1 << OCIE0A);
        OCR0A   = ((F_CPU / 8 / 48000) - 1);
        TCCR0A  = (1 << WGM01);  // CTC mode
        TIMSK0  = (1 << OCIE0A);
        OCR0A   = ((F_CPU / 8 / 48000) - 1);
        TCCR0A  = (1 << WGM01);  // CTC mode

-       TCCR0B  = (1 << CS01);   // Fcpu/8 speed        
+       TCCR0B  = (1 << CS01);   // Fcpu/8 speed

 
        /* Set speaker as output */
        DDRC   |= (1 << 6);
 
        /* Set speaker as output */
        DDRC   |= (1 << 6);


@@ -169,7 +169,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
        /* PWM speaker timer initialization */
        TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP
        TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, F_CPU speed
        /* PWM speaker timer initialization */
        TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP
        TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, F_CPU speed

-       
+

        puts_P(PSTR("Microphone Enumerated.\r\n"));
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
        puts_P(PSTR("Microphone Enumerated.\r\n"));
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }


@@ -238,7 +238,8 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
 
                LEDs_SetAllLEDs(LEDMask);
        }
 
                LEDs_SetAllLEDs(LEDMask);
        }

-       
+

        Pipe_Freeze();
        Pipe_SelectPipe(PrevPipe);
 }
        Pipe_Freeze();
        Pipe_SelectPipe(PrevPipe);
 }

+