aboutsummaryrefslogtreecommitdiffstats
path: root/Bootloaders
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-05-02 13:05:25 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-05-02 13:05:25 +0000
commit6a8e27f7ee43169b9f6eb928b12e00d6306618ff (patch)
treee918ffd16c91005992cf83583812bef4571dd338 /Bootloaders
parent13935a31b9bb1360c9e46c0893e77e0c47761cb9 (diff)
downloadlufa-6a8e27f7ee43169b9f6eb928b12e00d6306618ff.tar.gz
lufa-6a8e27f7ee43169b9f6eb928b12e00d6306618ff.tar.bz2
lufa-6a8e27f7ee43169b9f6eb928b12e00d6306618ff.zip
Fixed Endpoint_Write_Control_* functions writing more data than expected by the host, causing it to panic (thanks to Johannes Raschke).
Diffstat (limited to 'Bootloaders')
-rw-r--r--Bootloaders/CDC/BootloaderCDC.c2
-rw-r--r--Bootloaders/CDC/BootloaderCDC.h2
-rw-r--r--Bootloaders/CDC/Descriptors.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index ef8707d34..f36c4fc3e 100644
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -350,7 +350,7 @@ static void WriteNextResponseByte(const uint8_t Response)
/* Select the IN endpoint so that the next data byte can be written */
Endpoint_SelectEndpoint(CDC_TX_EPNUM);
- /* If OUT endpoint empty, clear it and wait for the next packet from the host */
+ /* If IN endpoint full, clear it and wait util ready for the next packet to the host */
if (!(Endpoint_IsReadWriteAllowed()))
{
Endpoint_ClearIN();
diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index 7669b836c..e302a3966 100644
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -82,7 +82,7 @@
#define BOOTLOADER_HWVERSION_MINOR 0x00
/** Eight character bootloader firmware identifier reported to the host when requested */
- #define SOFTWARE_IDENTIFIER "LUFA-CDC"
+ #define SOFTWARE_IDENTIFIER "LUFACDC"
/* Event Handlers: */
/** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index e9787cf7f..06088d8f7 100644
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -198,7 +198,7 @@ USB_Descriptor_String_t LanguageString =
*/
USB_Descriptor_String_t ProductString =
{
- .Header = {.Size = USB_STRING_LEN(15), .Type = DTYPE_String},
+ .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},
.UnicodeString = L"AVR CDC Bootloader"
};