From 6d2a08f1b77208de1f71dd4035d21f13e3f90462 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 1 Jun 2011 14:10:35 +0000 Subject: [PATCH] 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. --- Bootloaders/CDC/Descriptors.h | 6 +++--- Bootloaders/DFU/Descriptors.h | 6 +++--- Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c | 5 ++--- Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c | 1 + LUFA/Drivers/USB/Class/Host/MassStorage.c | 2 +- LUFA/ManPages/ChangeLog.txt | 2 +- LUFA/ManPages/FutureChanges.txt | 1 + LUFA/ManPages/LibraryApps.txt | 2 ++ 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h index 0c358e8466..9c6eb04c9f 100644 --- 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 - #define AVR_SIGNATURE_3 0x82 + #define AVR_SIGNATURE_3 0x89 #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 diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h index 14203c3e90..9bc4db5200 100644 --- 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 AVR_SIGNATURE_3 0x82 + #define AVR_SIGNATURE_3 0x89 #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 diff --git a/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c b/Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c index 8c98bcf6f9..6fe869cdab 100644 --- 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); /* PWM speaker timer initialization */ - TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0) - | (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP + TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, F_CPU speed puts_P(PSTR("Microphone Enumerated.\r\n")); @@ -225,6 +224,7 @@ void Audio_Task(void) USB_HostState = HOST_STATE_Configured; break; case HOST_STATE_Configured: + /* Do nothing - audio stream is handled by the timer interrupt routine */ break; } } @@ -269,6 +269,5 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK) } Pipe_Freeze(); - Pipe_SelectPipe(PrevPipe); } diff --git a/Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c b/Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c index fed18cb0c5..98df42372e 100644 --- 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; break; case HOST_STATE_Configured: + /* Do nothing - audio stream is handled by the timer interrupt routine */ break; } } diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c index 537ce51ea3..17f3ba70c9 100644 --- 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; - ErrorCode = HOST_SENDCONTROL_Successful; + ErrorCode = HOST_SENDCONTROL_Successful; } return ErrorCode; diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index ecbabad5de..777ac0db20 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -33,7 +33,7 @@ * - Core: * - None * - Library Applications: - * - None + * - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2 * * \section Sec_ChangeLog110528 Version 110528 * New: diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt index 154f86243d..47815ea440 100644 --- 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 + * -# Complete AVR32 port for existing devices, add UC3C support * -# Atmel ARM7 series microcontrollers * -# Other (commercial) C compilers */ diff --git a/LUFA/ManPages/LibraryApps.txt b/LUFA/ManPages/LibraryApps.txt index 2032edf5d9..3b44aa6dbe 100644 --- a/LUFA/ManPages/LibraryApps.txt +++ b/LUFA/ManPages/LibraryApps.txt @@ -92,6 +92,8 @@ * - StillImageHost - Still Image Camera host demo, using the low level LUFA APIs to implement the USB Still Image class * - VirtualSerialHost - Virtual Serial Port host demo, using the low level LUFA APIs to implement the USB CDC class * - Incomplete + * - AudioInputHost - Incomplete Audio Input host demo, using the low level LUFA APIs to implement a USB microphone host + * - AudioOutputHost - Incomplete Audio Output host demo, using the low level LUFA APIs to implement a USB speaker host * - BluetoothHost - Incomplete Bluetooth host demo, using the low level LUFA APIs to implement the USB Bluetooth class * - DualRole * - ClassDriver