Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2.

Minor documentation cleanups.

Modify the incomplete AudioInputHost demo for mono audio output.

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index 0c358e8..9c6eb04 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -83,11 +83,11 @@
                #elif defined(__AVR_ATmega8U2__)
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93
                #elif defined(__AVR_ATmega8U2__)
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93

-                       #define AVR_SIGNATURE_3               0x82
+                       #define AVR_SIGNATURE_3               0x89

                #elif defined(__AVR_AT90USB82__)
                        #define AVR_SIGNATURE_1               0x1E
                #elif defined(__AVR_AT90USB82__)
                        #define AVR_SIGNATURE_1               0x1E

-                       #define AVR_SIGNATURE_2               0x93
-                       #define AVR_SIGNATURE_3               0x89
+                       #define AVR_SIGNATURE_2               0x94
+                       #define AVR_SIGNATURE_3               0x82

                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif
                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 14203c3..9bc4db5 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -117,12 +117,12 @@
                        #define PRODUCT_ID_CODE               0x2FF7
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93
                        #define PRODUCT_ID_CODE               0x2FF7
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93

-                       #define AVR_SIGNATURE_3               0x82
+                       #define AVR_SIGNATURE_3               0x89

                #elif defined(__AVR_AT90USB82__)
                        #define PRODUCT_ID_CODE               0x2FEE
                        #define AVR_SIGNATURE_1               0x1E
                #elif defined(__AVR_AT90USB82__)
                        #define PRODUCT_ID_CODE               0x2FEE
                        #define AVR_SIGNATURE_1               0x1E

-                       #define AVR_SIGNATURE_2               0x93
-                       #define AVR_SIGNATURE_3               0x89
+                       #define AVR_SIGNATURE_2               0x94
+                       #define AVR_SIGNATURE_3               0x82

                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif
                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif

diff --git a/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c b/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c
index 8c98bcf..6fe869c 100644 (file)
--- a/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c
+++ b/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c
@@ -216,8 +216,7 @@ void Audio_Task(void)
                        DDRC   |= (1 << 6);\r
 \r
                        /* PWM speaker timer initialization */\r
                        DDRC   |= (1 << 6);\r
 \r
                        /* PWM speaker timer initialization */\r

-                       TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)\r
-                                       | (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP\r
+                       TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP\r

                        TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, F_CPU speed\r
                        \r
                        puts_P(PSTR("Microphone Enumerated.\r\n"));\r
                        TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, F_CPU speed\r
                        \r
                        puts_P(PSTR("Microphone Enumerated.\r\n"));\r


@@ -225,6 +224,7 @@ void Audio_Task(void)
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r

+                       /* Do nothing - audio stream is handled by the timer interrupt routine */\r

                        break;\r
        }\r
 }\r
                        break;\r
        }\r
 }\r


@@ -269,6 +269,5 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
        }\r
        \r
        Pipe_Freeze();\r
        }\r
        \r
        Pipe_Freeze();\r

-\r

        Pipe_SelectPipe(PrevPipe);\r
 }\r
        Pipe_SelectPipe(PrevPipe);\r
 }\r

diff --git a/Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c b/Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c
index fed18cb..98df423 100644 (file)
--- a/Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c
+++ b/Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c
@@ -218,6 +218,7 @@ void Audio_Task(void)
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r

+                       /* Do nothing - audio stream is handled by the timer interrupt routine */\r

                        break;\r
        }\r
 }\r
                        break;\r
        }\r
 }\r

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index 537ce51..17f3ba7 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -361,7 +361,7 @@ uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
        if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
        {
                *MaxLUNIndex = 0;
        if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
        {
                *MaxLUNIndex = 0;

-               ErrorCode = HOST_SENDCONTROL_Successful;
+               ErrorCode    = HOST_SENDCONTROL_Successful;

        }
 
        return ErrorCode;
        }
 
        return ErrorCode;

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index ecbabad..777ac0d 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -33,7 +33,7 @@
   *  - Core:
   *   - <i>None</i>
   *  - Library Applications:
   *  - Core:
   *   - <i>None</i>
   *  - Library Applications:

-  *   - <i>None</i>
+  *   - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2

   *
   *  \section Sec_ChangeLog110528 Version 110528
   *  <b>New:</b>
   *
   *  \section Sec_ChangeLog110528 Version 110528
   *  <b>New:</b>

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 154f862..47815ea 100644 (file)
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -34,6 +34,7 @@
   *      -# Add class driver support for Test and Measurement class
   *      -# Fix up Audio class support - add support for mixers, etc., add support for GET/SET commands
   *  - Ports
   *      -# Add class driver support for Test and Measurement class
   *      -# Fix up Audio class support - add support for mixers, etc., add support for GET/SET commands
   *  - Ports

+  *      -# Complete AVR32 port for existing devices, add UC3C support

   *      -# Atmel ARM7 series microcontrollers
   *      -# Other (commercial) C compilers
   */
   *      -# Atmel ARM7 series microcontrollers
   *      -# Other (commercial) C compilers
   */

diff --git a/LUFA/ManPages/LibraryApps.txt b/LUFA/ManPages/LibraryApps.txt
index 2032edf..3b44aa6 100644 (file)
--- a/LUFA/ManPages/LibraryApps.txt
+++ b/LUFA/ManPages/LibraryApps.txt
@@ -92,6 +92,8 @@
  *        - <b>StillImageHost</b> - Still Image Camera host demo, using the low level LUFA APIs to implement the USB Still Image class
  *        - <b>VirtualSerialHost</b> - Virtual Serial Port host demo, using the low level LUFA APIs to implement the USB CDC class
  *      - <b>Incomplete</b>
  *        - <b>StillImageHost</b> - Still Image Camera host demo, using the low level LUFA APIs to implement the USB Still Image class
  *        - <b>VirtualSerialHost</b> - Virtual Serial Port host demo, using the low level LUFA APIs to implement the USB CDC class
  *      - <b>Incomplete</b>

+ *        - <b>AudioInputHost</b> - Incomplete Audio Input host demo, using the low level LUFA APIs to implement a USB microphone host
+ *        - <b>AudioOutputHost</b> - Incomplete Audio Output host demo, using the low level LUFA APIs to implement a USB speaker host

  *        - <b>BluetoothHost</b> - Incomplete Bluetooth host demo, using the low level LUFA APIs to implement the USB Bluetooth class
  *    - <b>DualRole</b>
  *      - <b>ClassDriver</b>
  *        - <b>BluetoothHost</b> - Incomplete Bluetooth host demo, using the low level LUFA APIs to implement the USB Bluetooth class
  *    - <b>DualRole</b>
  *      - <b>ClassDriver</b>