Fix up the incomplete Webserver project so that it integrates with the uIP stack...

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

diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.c b/Demos/Device/LowLevel/AudioInput/AudioInput.c
index 7757ef1..98c2e8b 100644 (file)
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.c
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.c
@@ -1,21 +1,21 @@
 /*\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
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\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
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -78,21 +78,21 @@ void SetupHardware(void)
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and\r
  *  configures the sample update and PWM timers.\r
  */\r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and\r
  *  configures the sample update and PWM timers.\r
  */\r

-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r

 {\r
        /* Indicate USB enumerating */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 \r
        /* Sample reload timer initialization */\r
 {\r
        /* Indicate USB enumerating */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 \r
        /* Sample reload timer initialization */\r

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

        TCCR0A  = (1 << WGM01);  // CTC mode\r
        TCCR0A  = (1 << WGM01);  // CTC mode\r

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

 }\r
 \r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs, disables the sample update and PWM output timers and stops the USB and Audio management tasks.\r
  */\r
 }\r
 \r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs, disables the sample update and PWM output timers and stops the USB and Audio management tasks.\r
  */\r

-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r

 {\r
        /* Stop the sample reload timer */\r
        TCCR0B = 0;\r
 {\r
        /* Stop the sample reload timer */\r
        TCCR0B = 0;\r


@@ -107,22 +107,25 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured.\r
  */\r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured.\r
  */\r

-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r

 {\r
 {\r

-       /* Setup audio stream endpoint */\r
-       Endpoint_ConfigureEndpoint(AUDIO_STREAM_EPNUM, EP_TYPE_ISOCHRONOUS,\r
-                                      ENDPOINT_DIR_IN, 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_IN, AUDIO_STREAM_EPSIZE,\r
+                                        ENDPOINT_BANK_DOUBLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r

 }\r
 \r
 }\r
 \r

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r

  *  control requests that are not handled internally by the USB library (including the Audio class-specific\r
  *  requests) so that they can be handled appropriately for the application.\r
  */\r
  *  control requests that are not handled internally by the USB library (including the Audio class-specific\r
  *  requests) so that they can be handled appropriately for the application.\r
  */\r

-void EVENT_USB_UnhandledControlPacket(void)\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
        /* Process General and Audio specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r
 {\r
        /* Process General and Audio specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r


@@ -136,9 +139,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
                                StreamingAudioInterfaceSelected = ((USB_ControlRequest.wValue) != 0);\r
                                \r
                                /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
                                StreamingAudioInterfaceSelected = ((USB_ControlRequest.wValue) != 0);\r
                                \r

-                               /* Acknowledge status stage */\r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r

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


@@ -148,6 +149,10 @@ void EVENT_USB_UnhandledControlPacket(void)
 /** Task to manage the Audio interface, reading in ADC samples from the microphone, and them to the host. */\r
 void USB_Audio_Task(void)\r
 {\r
 /** Task to manage the Audio interface, reading in ADC samples from the microphone, and them to the host. */\r
 void USB_Audio_Task(void)\r
 {\r

+       /* Device must be connected and configured for the task to run */\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return;\r
+\r

        /* Check to see if the streaming interface is selected, if not the host is not receiving audio */\r
        if (!(StreamingAudioInterfaceSelected))\r
          return;\r
        /* Check to see if the streaming interface is selected, if not the host is not receiving audio */\r
        if (!(StreamingAudioInterfaceSelected))\r
          return;\r


@@ -164,10 +169,10 @@ void USB_Audio_Task(void)
                /* Audio sample is ADC value scaled to fit the entire range */\r
                int16_t AudioSample = ((SAMPLE_MAX_RANGE / ADC_MAX_RANGE) * ADC_GetResult());\r
                \r
                /* Audio sample is ADC value scaled to fit the entire range */\r
                int16_t AudioSample = ((SAMPLE_MAX_RANGE / ADC_MAX_RANGE) * ADC_GetResult());\r
                \r

-#if defined(MICROPHONE_BIASED_TO_HALF_RAIL)\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
                /* Microphone is biased to half rail voltage, subtract the bias from the sample value */\r
                AudioSample -= (SAMPLE_MAX_RANGE / 2));\r

-#endif\r
+               #endif\r

 \r
                /* Write the sample to the buffer */\r
                Endpoint_Write_Word_LE(AudioSample);\r
 \r
                /* Write the sample to the buffer */\r
                Endpoint_Write_Word_LE(AudioSample);\r