Fix incomplete StandaloneProgrammer project code not compiling due to the recent...

[pub/USBasp.git] / LUFA / ManPages / SoftwareBootloaderJump.txt

diff --git a/LUFA/ManPages/SoftwareBootloaderJump.txt b/LUFA/ManPages/SoftwareBootloaderJump.txt
index 1b284e4..2591a86 100644 (file)
--- a/LUFA/ManPages/SoftwareBootloaderJump.txt
+++ b/LUFA/ManPages/SoftwareBootloaderJump.txt
@@ -29,35 +29,41 @@
  *  uint32_t Boot_Key ATTR_NO_INIT;
  *
  *  #define MAGIC_BOOT_KEY            0xDC42ACCA
  *  uint32_t Boot_Key ATTR_NO_INIT;
  *
  *  #define MAGIC_BOOT_KEY            0xDC42ACCA

- *  #define BOOTLOADER_START_ADDRESS  ({FLASH_SIZE_BYTES} - {BOOTLOADER_SEC_SIZE_BYTES})
- *  
+ *  #define BOOTLOADER_START_ADDRESS  (FLASH_SIZE_BYTES - BOOTLOADER_SEC_SIZE_BYTES)
+ *

  *  void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3);
  *  void Bootloader_Jump_Check(void)
  *  {
  *      // If the reset source was the bootloader and the key is correct, clear it and jump to the bootloader
  *  void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3);
  *  void Bootloader_Jump_Check(void)
  *  {
  *      // If the reset source was the bootloader and the key is correct, clear it and jump to the bootloader

- *      if ((MCUSR & (1<<WDRF)) && (Boot_Key == MAGIC_BOOT_KEY))
+ *      if ((MCUSR & (1 << WDRF)) && (Boot_Key == MAGIC_BOOT_KEY))

  *      {
  *          Boot_Key = 0;
  *      {
  *          Boot_Key = 0;

- *          ((void (*)(void))BOOTLOADER_START_ADDRESS)(); 
+ *          ((void (*)(void))BOOTLOADER_START_ADDRESS)();

  *      }
  *  }
  *
  *  void Jump_To_Bootloader(void)
  *  {
  *      }
  *  }
  *
  *  void Jump_To_Bootloader(void)
  *  {

- *      // If USB is used, detatch from the bus and wait 2 seconds for the host to register it
+ *      // If USB is used, detach from the bus

  *      USB_ShutDown();
  *      USB_ShutDown();

+ *
+ *      // Disable all interrupts
+ *      cli();
+ *
+ *      // Wait two seconds for the USB detachment to register on the host

  *      for (uint8_t i = 0; i < 128; i++)
  *        _delay_ms(16);
  *
  *      // Set the bootloader key to the magic value and force a reset
  *      Boot_Key = MAGIC_BOOT_KEY;
  *      wdt_enable(WDTO_250MS);
  *      for (uint8_t i = 0; i < 128; i++)
  *        _delay_ms(16);
  *
  *      // Set the bootloader key to the magic value and force a reset
  *      Boot_Key = MAGIC_BOOT_KEY;
  *      wdt_enable(WDTO_250MS);

- *      for (;;); 
+ *      for (;;);

  *  }
  *  \endcode
  *
  *  }
  *  \endcode
  *

- *  Note that the bootloader magic key can be any arbitrary value. The {FLASH_SIZE_BYTES} and
- *  {BOOTLOADER_SEC_SIZE_BYTES} tokens should be replaced with the total flash size of the AVR
+ *  Note that the bootloader magic key can be any arbitrary value. The <em>FLASH_SIZE_BYTES</em> and
+ *  <em>BOOTLOADER_SEC_SIZE_BYTES</em> tokens should be replaced with the total flash size of the AVR

  *  in bytes, and the allocated size of the bootloader section for the target AVR.
  *  in bytes, and the allocated size of the bootloader section for the target AVR.

- * 
- */
\ No newline at end of file
+ *
+ */
+