Break device mode class driver interfaces into seperate config and state structs...

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

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index 67e08f2..f859c7c 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.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 Speaker_Audio_Interface =\r
+USB_ClassInfo_Audio_Device_t Speaker_Audio_Interface =\r

        {\r
        {\r

-               .StreamingInterfaceNumber = 1,\r
-\r
-               .DataOUTEndpointNumber    = AUDIO_STREAM_EPNUM,\r
-               .DataOUTEndpointSize      = AUDIO_STREAM_EPSIZE,\r
+               .Config =\r
+                       {\r
+                               .StreamingInterfaceNumber = 1,\r
+\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,7 +67,7 @@ int main(void)
        \r
        for (;;)\r
        {\r
        \r
        for (;;)\r
        {\r

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

                  ProcessNextSample();\r
 \r
                Audio_Device_USBTask(&Speaker_Audio_Interface);\r
                  ProcessNextSample();\r
 \r
                Audio_Device_USBTask(&Speaker_Audio_Interface);\r