Don't cast the line encoding baud rate to a uint16_t before performing the baud rate...

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

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index f666023..9f78786 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -36,7 +36,6 @@
 #define  INCLUDE_FROM_BOOTLOADERCDC_C\r
 #include "BootloaderCDC.h"\r
 \r
-/* Globals: */\r
 /** Line coding options for the virtual serial port. Although the virtual serial port data is never\r
  *  sent through a physical serial port, the line encoding data must still be read and preserved from\r
  *  the host, or the host will detect a problem and fail to open the port. This structure contains the\r
@@ -55,8 +54,8 @@ CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,
 uint32_t CurrAddress;\r
 \r
 /** Flag to indicate if the bootloader should be running, or should exit and allow the application code to run\r
- *  via a soft reset. When cleared, the bootloader will abort, the USB interface will shut down and the application\r
- *  jumped to via an indirect jump to location 0x0000.\r
+ *  via a watchdog reset. When cleared the bootloader will exit, starting the watchdog and entering an infinite\r
+ *  loop until the AVR restarts and the application runs.\r
  */\r
 bool RunBootloader = true;\r
 \r
@@ -70,18 +69,22 @@ int main(void)
        /* Setup hardware required for the bootloader */\r
        SetupHardware();\r
 \r
+       /* Enable global interrupts so that the USB stack can function */\r
+       sei();\r
+\r
        while (RunBootloader)\r
        {\r
                CDC_Task();\r
                USB_USBTask();\r
        }\r
        \r
-       /* Reset all configured hardware to their default states for the user app */\r
-       ResetHardware();\r
+       /* Disconnect from the host - USB interface will be reset later along with the AVR */\r
+       USB_Detach();\r
+\r
+       /* Enable the watchdog and force a timeout to reset the AVR */\r
+       wdt_enable(WDTO_250MS);\r
 \r
-       /* Start the user application */\r
-       AppPtr_t AppStartPtr = (AppPtr_t)0x0000;\r
-       AppStartPtr();  \r
+       for (;;);\r
 }\r
 \r
 /** Configures all hardware required for the bootloader. */\r
@@ -102,20 +105,6 @@ void SetupHardware(void)
        USB_Init();\r
 }\r
 \r
-/** Resets all configured hardware required for the bootloader back to their original states. */\r
-void ResetHardware(void)\r
-{\r
-       /* Shut down the USB subsystem */\r
-       USB_ShutDown();\r
-       \r
-       /* Relocate the interrupt vector table back to the application section */\r
-       MCUCR = (1 << IVCE);\r
-       MCUCR = 0;\r
-\r
-       /* Re-enable RWW section */\r
-       boot_rww_enable();\r
-}\r
-\r
 /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready\r
  *  to relay data to and from the attached USB host.\r
  */\r
@@ -344,7 +333,7 @@ static void WriteNextResponseByte(const uint8_t Response)
        /* Select the IN endpoint so that the next data byte can be written */\r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
        \r
-       /* If IN endpoint full, clear it and wait util ready for the next packet to the host */\r
+       /* If IN endpoint full, clear it and wait until ready for the next packet to the host */\r
        if (!(Endpoint_IsReadWriteAllowed()))\r
        {\r
                Endpoint_ClearIN();\r