Fix broken Endpoint/Pipe stream templates.

Simplify AudioOutput demos, to reduce the number of cycles needed to process each incomming sample.

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index a73f1c9..a95e43f 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -95,27 +95,20 @@ void ProcessNextSample(void)
                /* 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  = Audio_Device_ReadSample16(&Speaker_Audio_Interface);\r
-               int16_t RightSample_16Bit = Audio_Device_ReadSample16(&Speaker_Audio_Interface);\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
+               /* Retrieve the signed 16-bit left and right audio samples, convert to 8-bit */\r
+               int8_t  LeftSample_8Bit   = (Audio_Device_ReadSample16(&Speaker_Audio_Interface) >> 8);\r
+               int8_t  RightSample_8Bit  = (Audio_Device_ReadSample16(&Speaker_Audio_Interface) >> 8);\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
-               /* Get absolute value of mixed sample value */\r
-               uint8_t MixedSample_8Bit_Abs = abs(MixedSample_8Bit);\r
-\r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
-               OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
+               OCR3A = (MixedSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the dual 8-bit samples into the PWM timer channels */\r
-               OCR3A = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
-               OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
+               OCR3A = (LeftSample_8Bit  ^ (1 << 7));\r
+               OCR3B = (RightSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_PORTC)\r
                /* Load the 8-bit mixed sample into PORTC */\r
                PORTC = MixedSample_8Bit;\r
@@ -124,13 +117,13 @@ void ProcessNextSample(void)
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                /* Turn on LEDs as the sample amplitude increases */\r
-               if (MixedSample_8Bit_Abs > 16)\r
+               if (MixedSample_8Bit > 16)\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4);\r
-               else if (MixedSample_8Bit_Abs > 8)\r
+               else if (MixedSample_8Bit > 8)\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3);\r
-               else if (MixedSample_8Bit_Abs > 4)\r
+               else if (MixedSample_8Bit > 4)\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-               else if (MixedSample_8Bit_Abs > 2)\r
+               else if (MixedSample_8Bit > 2)\r
                  LEDMask = (LEDS_LED1);\r
 \r
                LEDs_SetAllLEDs(LEDMask);\r

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index dd880b4..28e57c4 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -195,9 +195,12 @@ void USB_Audio_Task(void)
                /* 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)Endpoint_Read_Word_LE();\r
-               int16_t RightSample_16Bit = (int16_t)Endpoint_Read_Word_LE();\r
+               /* Retrieve the signed 16-bit left and right audio samples, convert to 8-bit */\r
+               int8_t  LeftSample_8Bit   = ((int16_t)Endpoint_Read_Word_LE() >> 8);\r
+               int8_t  RightSample_8Bit  = ((int16_t)Endpoint_Read_Word_LE() >> 8);\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
                /* Check to see if the bank is now empty */\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
@@ -206,23 +209,13 @@ void USB_Audio_Task(void)
                        Endpoint_ClearOUT();\r
                }\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
-               /* 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
-               /* Get absolute value of mixed sample value */\r
-               uint8_t MixedSample_8Bit_Abs = abs(MixedSample_8Bit);\r
-\r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
-               OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
+               OCR3A = (MixedSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the dual 8-bit samples into the PWM timer channels */\r
-               OCR3A = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
-               OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
+               OCR3A = (LeftSample_8Bit  ^ (1 << 7));\r
+               OCR3B = (RightSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_PORTC)\r
                /* Load the 8-bit mixed sample into PORTC */\r
                PORTC = MixedSample_8Bit;\r
@@ -231,15 +224,15 @@ void USB_Audio_Task(void)
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                /* Turn on LEDs as the sample amplitude increases */\r
-               if (MixedSample_8Bit_Abs > 16)\r
+               if (MixedSample_8Bit > 16)\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4);\r
-               else if (MixedSample_8Bit_Abs > 8)\r
+               else if (MixedSample_8Bit > 8)\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3);\r
-               else if (MixedSample_8Bit_Abs > 4)\r
+               else if (MixedSample_8Bit > 4)\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-               else if (MixedSample_8Bit_Abs > 2)\r
+               else if (MixedSample_8Bit > 2)\r
                  LEDMask = (LEDS_LED1);\r
-                 \r
+\r
                LEDs_SetAllLEDs(LEDMask);\r
        }\r
 }\r

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
index 731c5f8..b753440 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
@@ -1,4 +1,4 @@
-uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length _CALLBACK_PARAM)\r
+uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)\r
 {\r
        uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));\r
        uint8_t  ErrorCode;\r

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
index 4250d61..3e09ac0 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
@@ -1,4 +1,4 @@
-uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length _CALLBACK_PARAM)\r
+uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)\r
 {\r
        uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));\r
        uint8_t  ErrorCode;\r