diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-05 13:16:36 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-05 13:16:36 +0000 |
| commit | 99c447c754e0b238aca99ac772b5dabb78fc8b48 (patch) | |
| tree | ce5a2f7855fed8676f4633f7d765075cec305e76 /Bootloaders/CDC | |
| parent | 4421782b7fb49e160b1c18f2295e6cd1f0b00c04 (diff) | |
| download | lufa-99c447c754e0b238aca99ac772b5dabb78fc8b48.tar.gz lufa-99c447c754e0b238aca99ac772b5dabb78fc8b48.tar.bz2 lufa-99c447c754e0b238aca99ac772b5dabb78fc8b48.zip | |
Fixed issue in USBtoSerial demos where the USART Rx line was not having its pullup enabled at startup, leading to noise being received from the Rx pin when left floating.
Removed unused relative Common.h header include from the DriverStubs board stub drivers.
Fixed Benito programmer, use the correct LED functions where needed to ensure correct status display at all times.
Diffstat (limited to 'Bootloaders/CDC')
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 6769a0c2d..f92595615 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -235,15 +235,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command) while (BlockSize--)
{
- if (MemoryType == 'E')
- {
- /* Read the next EEPROM byte into the endpoint */
- WriteNextResponseByte(eeprom_read_byte((uint8_t*)(uint16_t)(CurrAddress >> 1)));
-
- /* Increment the address counter after use */
- CurrAddress += 2;
- }
- else
+ if (MemoryType == 'F')
{
/* Read the next FLASH byte from the current FLASH page */
#if (FLASHEND > 0xFFFF)
@@ -258,6 +250,14 @@ static void ReadWriteMemoryBlock(const uint8_t Command) HighByte = !HighByte;
}
+ else
+ {
+ /* Read the next EEPROM byte into the endpoint */
+ WriteNextResponseByte(eeprom_read_byte((uint8_t*)(uint16_t)(CurrAddress >> 1)));
+
+ /* Increment the address counter after use */
+ CurrAddress += 2;
+ }
}
}
else
|