Minor updates to the Benito programmer - remove redundant PORT register manipulations.

[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..af0f6d2 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -40,12 +40,20 @@
  *  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
  *  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
        {\r

-               .StreamingInterfaceNumber = 1,\r
+               .Config =\r
+                       {\r
+                               .StreamingInterfaceNumber = 1,\r

 \r
 \r

-               .DataINEndpointNumber     = AUDIO_STREAM_EPNUM,\r
-               .DataINEndpointSize       = AUDIO_STREAM_EPSIZE,\r
+                               .DataINEndpointNumber     = AUDIO_STREAM_EPNUM,\r
+                               .DataINEndpointSize       = AUDIO_STREAM_EPSIZE,\r
+                       },\r
+               \r
+               .State =\r
+                       {\r
+                               // Leave all state values to their defaults\r
+                       }\r

        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -59,10 +67,10 @@ int main(void)
        \r
        for (;;)\r
        {\r
        \r
        for (;;)\r
        {\r

-               if (Microphone_Audio_Interface.InterfaceEnabled)\r
+               if (Microphone_Audio_Interface.State.InterfaceEnabled)\r

                  ProcessNextSample();\r
 \r
                  ProcessNextSample();\r
 \r

-               USB_Audio_USBTask(&Microphone_Audio_Interface);\r
+               Audio_Device_USBTask(&Microphone_Audio_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -92,7 +100,7 @@ void SetupHardware(void)
  */\r
 void ProcessNextSample(void)\r
 {\r
  */\r
 void ProcessNextSample(void)\r
 {\r

-       if ((TIFR0 & (1 << OCF0A)) && USB_Audio_IsReadyForNextSample(&Microphone_Audio_Interface))\r
+       if ((TIFR0 & (1 << OCF0A)) && Audio_Device_IsReadyForNextSample(&Microphone_Audio_Interface))\r

        {\r
                TIFR0 |= (1 << OCF0A);\r
 \r
        {\r
                TIFR0 |= (1 << OCF0A);\r
 \r


@@ -104,7 +112,7 @@ void ProcessNextSample(void)
                AudioSample -= (SAMPLE_MAX_RANGE / 2));\r
 #endif\r
 \r
                AudioSample -= (SAMPLE_MAX_RANGE / 2));\r
 #endif\r
 \r

-               USB_Audio_WriteSample16(AudioSample);\r
+               Audio_Device_WriteSample16(AudioSample);\r

        }\r
 }\r
 \r
        }\r
 }\r
 \r


@@ -133,12 +141,12 @@ void EVENT_USB_ConfigurationChanged(void)
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \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
 {\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
 {\r

-       USB_Audio_ProcessControlPacket(&Microphone_Audio_Interface);\r
+       Audio_Device_ProcessControlPacket(&Microphone_Audio_Interface);\r

 }\r
 }\r