From 13935a31b9bb1360c9e46c0893e77e0c47761cb9 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sat, 2 May 2009 05:49:15 +0000 Subject: Fixed reversed signature byte ordering in the CDC bootloader (thanks to Johannes Raschke). --- Bootloaders/CDC/BootloaderCDC.c | 4 ++-- LUFA/ChangeLog.txt | 1 + LUFA/Drivers/USB/HighLevel/Events.h | 4 ++-- LUFA/Drivers/USB/LowLevel/LowLevel.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 708ba359d..ef8707d34 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -424,9 +424,9 @@ TASK(CDC_Task) } else if (Command == 's') { - WriteNextResponseByte(SIGNATURE_0); - WriteNextResponseByte(SIGNATURE_1); WriteNextResponseByte(SIGNATURE_2); + WriteNextResponseByte(SIGNATURE_1); + WriteNextResponseByte(SIGNATURE_0); } else if (Command == 'b') { diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index bdff2bf09..ae9b22d3f 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -66,6 +66,7 @@ * - Fixed SPI driver init function not clearing SPI2X bit when not needed * - Fixed PREVENT ALLOW MEDIUM REMOVAL command issuing in the MassStorageHost demo using incorrect parameters (thanks to Mike Alex) * - Fixed MassStorageHost demo broken due to an incorrect if statement test in MassStore_GetReturnedStatus() + * - Fixed reversed signature byte ordering in the CDC bootloader (thanks to Johannes Raschke) * * * \section Sec_ChangeLog090401 Version 090401 diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h index 317495cc0..781553457 100644 --- a/LUFA/Drivers/USB/HighLevel/Events.h +++ b/LUFA/Drivers/USB/HighLevel/Events.h @@ -265,11 +265,11 @@ * in host mode, and an attached USB device has failed to enumerate completely. * * \param ErrorCode Error code indicating the failure reason, a value in - * USB_Host_EnumerationErrorCodes_t located in Host.h. + * \ref USB_Host_EnumerationErrorCodes_t located in Host.h. * * \param SubErrorCode Sub error code indicating the reason for failure - for example, if the * ErrorCode parameter indicates a control error, this will give the error - * code returned by the USB_Host_SendControlRequest() function. + * code returned by the \ref USB_Host_SendControlRequest() function. * * \note This event only exists on USB AVR models which supports host mode. * diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c index 3994e2f11..1616ae520 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.c +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c @@ -150,10 +150,10 @@ void USB_ResetInterface(void) USB_INT_DisableAllInterrupts(); USB_INT_ClearAllInterrupts(); - USB_IsConnected = false; + USB_IsConnected = false; #if defined(USB_CAN_BE_HOST) - USB_HostState = HOST_STATE_Unattached; + USB_HostState = HOST_STATE_Unattached; #endif #if defined(USB_CAN_BE_DEVICE) -- cgit v1.2.3