Better solution - change compile time token names to DEVICE_STATE_AS_GPIOR and HOST_S...

[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 8c3bf61..bbcd2fd 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.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
  *  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
+               .Config =\r
+                       {\r
+                               .StreamingInterfaceNumber = 1,\r

 \r
 \r

-               .DataOUTEndpointNumber    = AUDIO_STREAM_EPNUM,\r
-               .DataOUTEndpointSize      = 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
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -59,10 +62,10 @@ 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
                  ProcessNextSample();\r
 \r

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

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


@@ -87,37 +90,37 @@ void SetupHardware(void)
  */\r
 void ProcessNextSample(void)\r
 {\r
  */\r
 void ProcessNextSample(void)\r
 {\r

-       if ((TIFR0 & (1 << OCF0A)) && USB_Audio_IsSampleReceived(&Speaker_Audio_Interface))\r
+       if ((TIFR0 & (1 << OCF0A)) && Audio_Device_IsSampleReceived(&Speaker_Audio_Interface))\r

        {\r
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r
 \r
                /* Retrieve the signed 16-bit left and right audio samples */\r
        {\r
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r
 \r
                /* Retrieve the signed 16-bit left and right audio samples */\r

-               int16_t LeftSample_16Bit  = (int16_t)USB_Audio_ReadSample16();\r
-               int16_t RightSample_16Bit = (int16_t)USB_Audio_ReadSample16();\r
+               int16_t LeftSample_16Bit  = (int16_t)Audio_Device_ReadSample16();\r
+               int16_t RightSample_16Bit = (int16_t)Audio_Device_ReadSample16();\r

 \r
                /* Massage signed 16-bit left and right audio samples into signed 8-bit */\r
                int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);\r
                int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);\r
 \r
                /* Massage signed 16-bit left and right audio samples into signed 8-bit */\r
                int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);\r
                int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);\r

-                       \r
+\r

                /* Mix the two channels together to produce a mono, 8-bit sample */\r
                int8_t  MixedSample_8Bit  = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1);\r
 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
                /* Mix the two channels together to produce a mono, 8-bit sample */\r
                int8_t  MixedSample_8Bit  = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1);\r
 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r

-               OCRxA = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
+               OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r

 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the dual 8-bit samples into the PWM timer channels */\r
 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the dual 8-bit samples into the PWM timer channels */\r

-               OCRxA = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
-               OCRxB = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
+               OCR3A = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
+               OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r

 #elif defined(AUDIO_OUT_PORTC)\r
 #elif defined(AUDIO_OUT_PORTC)\r

+               /* Load the 8-bit mixed sample into PORTC */\r

                PORTC = MixedSample_8Bit;\r
 #else\r
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                /* Make mixed sample value positive (absolute) */\r
                PORTC = MixedSample_8Bit;\r
 #else\r
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                /* Make mixed sample value positive (absolute) */\r

-               if (MixedSample_8Bit < 0)\r
-                 MixedSample_8Bit = -MixedSample_8Bit;\r
+               MixedSample_8Bit = abs(MixedSample_8Bit);\r

 \r
                if (MixedSample_8Bit > ((128 / 8) * 1))\r
                  LEDMask |= LEDS_LED1;\r
 \r
                if (MixedSample_8Bit > ((128 / 8) * 1))\r
                  LEDMask |= LEDS_LED1;\r


@@ -159,10 +162,10 @@ void EVENT_USB_Connect(void)
 \r
 #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
        /* PWM speaker timer initialization */\r
 \r
 #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
        /* PWM speaker timer initialization */\r

-       TCCRxA  = ((1 << WGMx0) | (1 << COMxA1) | (1 << COMxA0)\r
-                                                       | (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP\r
-       TCCRxB  = ((1 << WGMx2) | (1 << CSx0));  // Fast 8-Bit PWM, Fcpu speed\r
-#endif \r
+       TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)\r
+               | (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP\r
+       TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, Fcpu speed\r
+#endif\r

 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r


@@ -175,8 +178,8 @@ void EVENT_USB_Disconnect(void)
 \r
 #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
        /* Stop the PWM generation timer */\r
 \r
 #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
        /* Stop the PWM generation timer */\r

-       TCCRxB = 0;\r
-#endif         \r
+       TCCR3B = 0;\r
+#endif\r

 \r
 #if defined(AUDIO_OUT_MONO)\r
        /* Set speaker as input to reduce current draw */\r
 \r
 #if defined(AUDIO_OUT_MONO)\r
        /* Set speaker as input to reduce current draw */\r


@@ -195,12 +198,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(&Speaker_Audio_Interface)))\r
+       if (!(Audio_Device_ConfigureEndpoints(&Speaker_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(&Speaker_Audio_Interface);\r
+       Audio_Device_ProcessControlPacket(&Speaker_Audio_Interface);\r

 }\r
 }\r