Port the device mode demos to the XMEGA architecture where applicable.

[pub/USBasp.git] / Bootloaders / CDC / BootloaderCDC.c

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index bb5c1e6..acdcde3 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -96,7 +96,7 @@ void Application_Jump_Check(void)
        {
                /* Turn off the watchdog */
                MCUSR &= ~(1<<WDRF);
-               wdt_disable(); 
+               wdt_disable();
 
                /* Clear the boot key and jump to the user application */
                MagicBootKey = 0;
@@ -119,7 +119,7 @@ int main(void)
        LEDs_SetAllLEDs(LEDS_LED1);
 
        /* Enable global interrupts so that the USB stack can function */
-       sei();
+       GlobalInterruptEnable();
 
        while (RunBootloader)
        {
@@ -129,7 +129,7 @@ int main(void)
 
        /* Disconnect from the host - USB interface will be reset later along with the AVR */
        USB_Detach();
-       
+
        /* Unlock the forced application start mode of the bootloader if it is restarted */
        MagicBootKey = MAGIC_BOOT_KEY;
 
@@ -237,7 +237,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
        uint16_t BlockSize;
        char     MemoryType;
 
-       bool     HighByte = false;
+       uint8_t  HighByte = 0;
        uint8_t  LowByte  = 0;
 
        BlockSize  = (FetchNextCommandByte() << 8);
@@ -442,7 +442,7 @@ static void CDC_Task(void)
        }
        else if (Command == AVR109_COMMAND_SetCurrentAddress)
        {
-               /* Set the current address to that given by the host */
+               /* Set the current address to that given by the host (translate 16-bit word address to byte address) */
                CurrAddress   = (FetchNextCommandByte() << 9);
                CurrAddress  |= (FetchNextCommandByte() << 1);
 
@@ -460,7 +460,7 @@ static void CDC_Task(void)
                for (uint8_t CurrByte = 0; CurrByte < 7; CurrByte++)
                  WriteNextResponseByte(SOFTWARE_IDENTIFIER[CurrByte]);
        }
-       else if (Command == AVR109_COMMAND_ReadBootloaderVersion)
+       else if (Command == AVR109_COMMAND_ReadBootloaderSWVersion)
        {
                WriteNextResponseByte('0' + BOOTLOADER_VERSION_MAJOR);
                WriteNextResponseByte('0' + BOOTLOADER_VERSION_MINOR);