gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 04:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Minor documentation cleanups.

Modify the incomplete AudioInputHost demo for mono audio output.
This commit is contained in:
Dean Camera 2011-06-01 14:10:35 +00:00
parent 68468e0aea
commit 6d2a08f1b7
8 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bootloaders/CDC/Descriptors.h
View File

@ -83,11 +83,11 @@
#elif defined(__AVR_ATmega8U2__) #elif defined(__AVR_ATmega8U2__)
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93 #define AVR_SIGNATURE_2 0x93
#define AVR_SIGNATURE_3 0x82 #define AVR_SIGNATURE_3 0x89
#elif defined(__AVR_AT90USB82__) #elif defined(__AVR_AT90USB82__)
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93 #define AVR_SIGNATURE_2 0x94
#define AVR_SIGNATURE_3 0x89 #define AVR_SIGNATURE_3 0x82
#else #else
#error The selected AVR part is not currently supported by this bootloader. #error The selected AVR part is not currently supported by this bootloader.
#endif #endif

6
Bootloaders/DFU/Descriptors.h
View File

@ -117,12 +117,12 @@
#define PRODUCT_ID_CODE 0x2FF7 #define PRODUCT_ID_CODE 0x2FF7
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93 #define AVR_SIGNATURE_2 0x93
#define AVR_SIGNATURE_3 0x82 #define AVR_SIGNATURE_3 0x89
#elif defined(__AVR_AT90USB82__) #elif defined(__AVR_AT90USB82__)
#define PRODUCT_ID_CODE 0x2FEE #define PRODUCT_ID_CODE 0x2FEE
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93 #define AVR_SIGNATURE_2 0x94
#define AVR_SIGNATURE_3 0x89 #define AVR_SIGNATURE_3 0x82
#else #else
#error The selected AVR part is not currently supported by this bootloader. #error The selected AVR part is not currently supported by this bootloader.
#endif #endif

5
Demos/Host/Incomplete/AudioInputHost/AudioInputHost.c
View File

@ -216,8 +216,7 @@ void Audio_Task(void)
DDRC |= (1 << 6); DDRC |= (1 << 6);
/* PWM speaker timer initialization */ /* PWM speaker timer initialization */
TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0) TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP
| (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP
TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, F_CPU speed TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, F_CPU speed
puts_P(PSTR("Microphone Enumerated.\r\n")); puts_P(PSTR("Microphone Enumerated.\r\n"));
@ -225,6 +224,7 @@ void Audio_Task(void)
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
case HOST_STATE_Configured: case HOST_STATE_Configured:
/* Do nothing - audio stream is handled by the timer interrupt routine */
break; break;
} }
} }
@ -269,6 +269,5 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
} }
Pipe_Freeze(); Pipe_Freeze();
Pipe_SelectPipe(PrevPipe); Pipe_SelectPipe(PrevPipe);
} }

1
Demos/Host/Incomplete/AudioOutputHost/AudioOutputHost.c
View File

@ -218,6 +218,7 @@ void Audio_Task(void)
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
case HOST_STATE_Configured: case HOST_STATE_Configured:
/* Do nothing - audio stream is handled by the timer interrupt routine */
break; break;
} }
} }

2
LUFA/Drivers/USB/Class/Host/MassStorage.c
View File

@ -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) if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
{ {
*MaxLUNIndex = 0; *MaxLUNIndex = 0;
ErrorCode = HOST_SENDCONTROL_Successful; ErrorCode = HOST_SENDCONTROL_Successful;
} }
return ErrorCode; return ErrorCode;

2
LUFA/ManPages/ChangeLog.txt
View File

@ -33,7 +33,7 @@
* - Core: * - Core:
* - <i>None</i> * - <i>None</i>
* - Library Applications: * - Library Applications:
* - <i>None</i> * - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
* *
* \section Sec_ChangeLog110528 Version 110528 * \section Sec_ChangeLog110528 Version 110528
* <b>New:</b> * <b>New:</b>

1
LUFA/ManPages/FutureChanges.txt
View File

@ -34,6 +34,7 @@
* -# Add class driver support for Test and Measurement class * -# 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 * -# Fix up Audio class support - add support for mixers, etc., add support for GET/SET commands
* - Ports * - Ports
* -# Complete AVR32 port for existing devices, add UC3C support
* -# Atmel ARM7 series microcontrollers * -# Atmel ARM7 series microcontrollers
* -# Other (commercial) C compilers * -# Other (commercial) C compilers
*/ */

2
LUFA/ManPages/LibraryApps.txt
View File

@ -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>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>VirtualSerialHost</b> - Virtual Serial Port host demo, using the low level LUFA APIs to implement the USB CDC class
* - <b>Incomplete</b> * - <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>BluetoothHost</b> - Incomplete Bluetooth host demo, using the low level LUFA APIs to implement the USB Bluetooth class
* - <b>DualRole</b> * - <b>DualRole</b>
* - <b>ClassDriver</b> * - <b>ClassDriver</b>