The incomplete StandaloneProgrammer project now uses Host and Device Mass storage...

[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 93ffe0b..9bd5fe4 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,10 +62,9 @@ int main(void)
        \r
        for (;;)\r
        {\r
-               if (Microphone_Audio_Interface.InterfaceEnabled)\r
-                 ProcessNextSample();\r
+               ProcessNextSample();\r
 \r
-               USB_Audio_USBTask(&Microphone_Audio_Interface);\r
+               Audio_Device_USBTask(&Microphone_Audio_Interface);\r
                USB_USBTask();\r
        }\r
 }\r
@@ -92,35 +94,36 @@ void SetupHardware(void)
  */\r
 void ProcessNextSample(void)\r
 {\r
-       if ((TIFR0 & (1 << OCF0A)) && USB_Audio_IsReadyForNextSample(&Microphone_Audio_Interface))\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
 \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
-#endif\r
+               #endif\r
 \r
-               USB_Audio_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
        /* 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
-       TCCR0B  = (1 << CS00);   // Fcpu speed\r
+       TCCR0B  = (1 << CS01);   // Fcpu/8 speed\r
 }\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,16 +132,16 @@ 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
-       if (!(USB_Audio_ConfigureEndpoints(&Microphone_Audio_Interface)))\r
+       if (!(Audio_Device_ConfigureEndpoints(&Microphone_Audio_Interface)))\r
          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
-       USB_Audio_ProcessControlPacket(&Microphone_Audio_Interface);\r
+       Audio_Device_ProcessControlRequest(&Microphone_Audio_Interface);\r
 }\r