Commit for the 090810 release.

[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 a361ea1..3aa26ae 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -40,12 +40,15 @@
  *  passed to all Audio Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r
-USB_ClassInfo_Audio_t Microphone_Audio_Interface =\r
+USB_ClassInfo_Audio_Device_t Microphone_Audio_Interface =\r
        {\r
-               .StreamingInterfaceNumber = 1,\r
+               .Config =\r
+                       {\r
+                               .StreamingInterfaceNumber = 1,\r
 \r
-               .DataINEndpointNumber     = AUDIO_STREAM_EPNUM,\r
-               .DataINEndpointSize       = AUDIO_STREAM_EPSIZE,\r
+                               .DataINEndpointNumber     = AUDIO_STREAM_EPNUM,\r
+                               .DataINEndpointSize       = AUDIO_STREAM_EPSIZE,\r
+                       },\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
@@ -59,8 +62,7 @@ int main(void)
        \r
        for (;;)\r
        {\r
-               if (Microphone_Audio_Interface.InterfaceEnabled)\r
-                 ProcessNextSample();\r
+               ProcessNextSample();\r
 \r
                Audio_Device_USBTask(&Microphone_Audio_Interface);\r
                USB_USBTask();\r
@@ -92,6 +94,7 @@ void SetupHardware(void)
  */\r
 void ProcessNextSample(void)\r
 {\r
+       /* Check if the sample reload timer period has elapsed, and that the USB bus is ready for a new sample */\r
        if ((TIFR0 & (1 << OCF0A)) && Audio_Device_IsReadyForNextSample(&Microphone_Audio_Interface))\r
        {\r
                TIFR0 |= (1 << OCF0A);\r
@@ -104,12 +107,12 @@ void ProcessNextSample(void)
                AudioSample -= (SAMPLE_MAX_RANGE / 2));\r
 #endif\r
 \r
-               Audio_Device_WriteSample16(AudioSample);\r
+               Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample);\r
        }\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 \r
@@ -120,7 +123,7 @@ void EVENT_USB_Connect(void)
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r
 {\r
        /* Stop the sample reload timer */\r
        TCCR0B = 0;\r
@@ -129,7 +132,7 @@ void EVENT_USB_Disconnect(void)
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \r
@@ -137,8 +140,8 @@ void EVENT_USB_ConfigurationChanged(void)
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
-/** Event handler for the library USB Unhandled Control Packet event. */\r
-void EVENT_USB_UnhandledControlPacket(void)\r
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r
 {\r
-       Audio_Device_ProcessControlPacket(&Microphone_Audio_Interface);\r
+       Audio_Device_ProcessControlRequest(&Microphone_Audio_Interface);\r
 }\r