Device mode class driver callbacks are now fired before the control request status...

[pub/USBasp.git] / Demos / Device / ClassDriver / AudioInput / AudioInput.c

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
index fc0d82a..09a2f0f 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

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


@@ -59,6 +59,7 @@ int main(void)
        SetupHardware();\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
        SetupHardware();\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r

+       sei();\r

        \r
        for (;;)\r
        {\r
        \r
        for (;;)\r
        {\r


@@ -86,7 +87,7 @@ void SetupHardware(void)
        ADC_SetupChannel(MIC_IN_ADC_CHANNEL);\r
        \r
        /* Start the ADC conversion in free running mode */\r
        ADC_SetupChannel(MIC_IN_ADC_CHANNEL);\r
        \r
        /* Start the ADC conversion in free running mode */\r

-       ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | MIC_IN_ADC_CHANNEL);\r
+       ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | MIC_IN_ADC_MUX_MASK);\r

 }\r
 \r
 /** Processes the next audio sample by reading the last ADC conversion and writing it to the audio\r
 }\r
 \r
 /** Processes the next audio sample by reading the last ADC conversion and writing it to the audio\r


@@ -104,7 +105,7 @@ void ProcessNextSample(void)
                \r
                #if defined(MICROPHONE_BIASED_TO_HALF_RAIL)\r
                /* Microphone is biased to half rail voltage, subtract the bias from the sample value */\r
                \r
                #if defined(MICROPHONE_BIASED_TO_HALF_RAIL)\r
                /* Microphone is biased to half rail voltage, subtract the bias from the sample value */\r

-               AudioSample -= (SAMPLE_MAX_RANGE / 2));\r
+               AudioSample -= (SAMPLE_MAX_RANGE / 2);\r

                #endif\r
 \r
                Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample);\r
                #endif\r
 \r
                Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample);\r