Added new USB_Host_SetDeviceConfiguration() convenience function. Change over Low...

[pub/USBasp.git] / Bootloaders / DFU / BootloaderDFU.c

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index f358016..58a7511 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -98,6 +98,23 @@ uint16_t EndAddr = 0x0000;
  */\r
 int main (void)\r
 {\r
  */\r
 int main (void)\r
 {\r

+       /* Configure hardware required by the bootloader */\r
+       SetupHardware();\r
+\r
+       /* Run the USB management task while the bootloader is supposed to be running */\r
+       while (RunBootloader || WaitForExit)\r
+         USB_USBTask();\r
+       \r
+       /* Reset configured hardware back to their original states for the user application */\r
+       ResetHardware();\r
+       \r
+       /* Start the user application */\r
+       AppStartPtr();\r
+}\r
+\r
+/** Configures all hardware required for the bootloader. */\r
+void SetupHardware(void)\r
+{\r

        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r


@@ -111,35 +128,23 @@ int main (void)
 \r
        /* Initialize the USB subsystem */\r
        USB_Init();\r
 \r
        /* Initialize the USB subsystem */\r
        USB_Init();\r

+}\r

 \r
 \r

-       /* Run the USB management task while the bootloader is supposed to be running */\r
-       while (RunBootloader || WaitForExit)\r
-         USB_USBTask();\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
        /* 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
-       /* Reset any used hardware ports back to their defaults */\r
-       PORTD = 0;\r
-       DDRD  = 0;\r
-       \r
-       #if defined(PORTE)\r
-       PORTE = 0;\r
-       DDRE  = 0;\r
-       #endif\r
-       \r
-       /* Start the user application */\r
-       AppStartPtr();\r

 }\r
 \r
 /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user\r
  *  application started.\r
  */\r
 }\r
 \r
 /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user\r
  *  application started.\r
  */\r

-EVENT_HANDLER(USB_Disconnect)\r
+void EVENT_USB_Disconnect(void)\r

 {\r
        /* Upon disconnection, run user application */\r
        RunBootloader = false;\r
 {\r
        /* Upon disconnection, run user application */\r
        RunBootloader = false;\r


@@ -149,21 +154,15 @@ EVENT_HANDLER(USB_Disconnect)
  *  control requests that are not handled internally by the USB library (including the DFU commands, which are\r
  *  all issued via the control endpoint), so that they can be handled appropriately for the application.\r
  */\r
  *  control requests that are not handled internally by the USB library (including the DFU commands, which are\r
  *  all issued via the control endpoint), so that they can be handled appropriately for the application.\r
  */\r

-EVENT_HANDLER(USB_UnhandledControlPacket)\r
+void EVENT_USB_UnhandledControlPacket(void)\r

 {\r
 {\r

-       /* Discard unused wIndex value */\r
-       Endpoint_Discard_Word();\r
-       \r
-       /* Discard unused wValue value */\r
-       Endpoint_Discard_Word();\r
-\r

        /* Get the size of the command and data from the wLength value */\r
        /* Get the size of the command and data from the wLength value */\r

-       SentCommand.DataSize = Endpoint_Read_Word_LE();\r
+       SentCommand.DataSize = USB_ControlRequest.wLength;\r

 \r
 \r

-       switch (bRequest)\r
+       switch (USB_ControlRequest.bRequest)\r

        {\r
                case DFU_DNLOAD:\r
        {\r
                case DFU_DNLOAD:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Check if bootloader is waiting to terminate */\r
                        if (WaitForExit)\r
                        \r
                        /* Check if bootloader is waiting to terminate */\r
                        if (WaitForExit)\r


@@ -225,7 +224,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                {\r
                                                        uint16_t Words[2];\r
                                                        uint32_t Long;\r
                                                {\r
                                                        uint16_t Words[2];\r
                                                        uint32_t Long;\r

-                                               } CurrFlashAddress                 = {Words: {StartAddr, Flash64KBPage}};\r
+                                               } CurrFlashAddress                 = {.Words = {StartAddr, Flash64KBPage}};\r

                                                \r
                                                uint32_t CurrFlashPageStartAddress = CurrFlashAddress.Long;\r
                                                uint8_t  WordsInFlashPage          = 0;\r
                                                \r
                                                uint32_t CurrFlashPageStartAddress = CurrFlashAddress.Long;\r
                                                uint8_t  WordsInFlashPage          = 0;\r


@@ -235,7 +234,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r

-                                                               Endpoint_ClearControlOUT();\r
+                                                               Endpoint_ClearOUT();\r

                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r
                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r


@@ -279,7 +278,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r

-                                                               Endpoint_ClearControlOUT();\r
+                                                               Endpoint_ClearOUT();\r

                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r
                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r


@@ -296,15 +295,15 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                }\r
                        }\r
 \r
                                }\r
                        }\r
 \r

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r
 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

                                \r
                        break;\r
                case DFU_UPLOAD:\r
                                \r
                        break;\r
                case DFU_UPLOAD:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

 \r
                        while (!(Endpoint_IsINReady()));\r
 \r
 \r
                        while (!(Endpoint_IsINReady()));\r
 \r


@@ -336,19 +335,19 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                        {\r
                                                uint16_t Words[2];\r
                                                uint32_t Long;\r
                                        {\r
                                                uint16_t Words[2];\r
                                                uint32_t Long;\r

-                                       } CurrFlashAddress = {Words: {StartAddr, Flash64KBPage}};\r
+                                       } CurrFlashAddress = {.Words = {StartAddr, Flash64KBPage}};\r

 \r
                                        while (WordsRemaining--)\r
                                        {\r
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r
 \r
                                        while (WordsRemaining--)\r
                                        {\r
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r

-                                                       Endpoint_ClearControlIN();\r
+                                                       Endpoint_ClearIN();\r

                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r
                                                /* Read the flash word and send it via USB to the host */\r
                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r
                                                /* Read the flash word and send it via USB to the host */\r

-                                               #if defined(RAMPZ)\r
+                                               #if (FLASHEND > 0xFFFF)\r

                                                        Endpoint_Write_Word_LE(pgm_read_word_far(CurrFlashAddress.Long));\r
                                                #else\r
                                                        Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long));                                                   \r
                                                        Endpoint_Write_Word_LE(pgm_read_word_far(CurrFlashAddress.Long));\r
                                                #else\r
                                                        Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long));                                                   \r


@@ -368,7 +367,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r

-                                                       Endpoint_ClearControlIN();\r
+                                                       Endpoint_ClearIN();\r

                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r
                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r


@@ -384,15 +383,15 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                DFU_State = dfuIDLE;\r
                        }\r
 \r
                                DFU_State = dfuIDLE;\r
                        }\r
 \r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsOUTReceived()));\r
 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsOUTReceived()));\r

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

 \r
                        break;\r
                case DFU_GETSTATUS:\r
 \r
                        break;\r
                case DFU_GETSTATUS:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Write 8-bit status value */\r
                        Endpoint_Write_Byte(DFU_Status);\r
                        \r
                        /* Write 8-bit status value */\r
                        Endpoint_Write_Byte(DFU_Status);\r


@@ -407,46 +406,46 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        /* Write 8-bit state string ID number */\r
                        Endpoint_Write_Byte(0);\r
 \r
                        /* Write 8-bit state string ID number */\r
                        Endpoint_Write_Byte(0);\r
 \r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsOUTReceived()));\r
                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsOUTReceived()));\r

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

        \r
                        break;          \r
                case DFU_CLRSTATUS:\r
        \r
                        break;          \r
                case DFU_CLRSTATUS:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r
 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r
                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r
 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

                        \r
                        break;\r
                case DFU_GETSTATE:\r
                        \r
                        break;\r
                case DFU_GETSTATE:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Write the current device state to the endpoint */\r
                        Endpoint_Write_Byte(DFU_State);\r
                \r
                        \r
                        /* Write the current device state to the endpoint */\r
                        Endpoint_Write_Byte(DFU_State);\r
                \r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsOUTReceived()));\r
                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsOUTReceived()));\r

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

 \r
                        break;\r
                case DFU_ABORT:\r
 \r
                        break;\r
                case DFU_ABORT:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r
                        \r
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

 \r
                        break;\r
        }\r
 \r
                        break;\r
        }\r


@@ -463,13 +462,15 @@ static void DiscardFillerBytes(uint8_t NumberOfBytes)
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r
                {\r
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r
                {\r

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

 \r
                        /* Wait until next data packet received */\r
                        while (!(Endpoint_IsOUTReceived()));\r
                }\r
 \r
                        /* Wait until next data packet received */\r
                        while (!(Endpoint_IsOUTReceived()));\r
                }\r

-\r
-               Endpoint_Discard_Byte();                                                \r
+               else\r
+               {\r
+                       Endpoint_Discard_Byte();\r
+               }\r

        }\r
 }\r
 \r
        }\r
 }\r
 \r


@@ -531,8 +532,8 @@ static void LoadStartEndAddresses(void)
        {\r
                uint8_t  Bytes[2];\r
                uint16_t Word;\r
        {\r
                uint8_t  Bytes[2];\r
                uint16_t Word;\r

-       } Address[2] = {{Bytes: {SentCommand.Data[2], SentCommand.Data[1]}},\r
-                       {Bytes: {SentCommand.Data[4], SentCommand.Data[3]}}};\r
+       } Address[2] = {{.Bytes = {SentCommand.Data[2], SentCommand.Data[1]}},\r
+                       {.Bytes = {SentCommand.Data[4], SentCommand.Data[3]}}};\r

                \r
        /* Load in the start and ending read addresses from the sent data packet */\r
        StartAddr = Address[0].Word;\r
                \r
        /* Load in the start and ending read addresses from the sent data packet */\r
        StartAddr = Address[0].Word;\r


@@ -557,7 +558,7 @@ static void ProcessMemProgCommand(void)
                        {\r
                                uint16_t Words[2];\r
                                uint32_t Long;\r
                        {\r
                                uint16_t Words[2];\r
                                uint32_t Long;\r

-                       } CurrFlashAddress = {Words: {StartAddr, Flash64KBPage}};\r
+                       } CurrFlashAddress = {.Words = {StartAddr, Flash64KBPage}};\r

                        \r
                        /* Erase the current page's temp buffer */\r
                        boot_page_erase(CurrFlashAddress.Long);\r
                        \r
                        /* Erase the current page's temp buffer */\r
                        boot_page_erase(CurrFlashAddress.Long);\r


@@ -591,7 +592,7 @@ static void ProcessMemReadCommand(void)
                while (CurrFlashAddress < BOOT_START_ADDR)\r
                {\r
                        /* Check if the current byte is not blank */\r
                while (CurrFlashAddress < BOOT_START_ADDR)\r
                {\r
                        /* Check if the current byte is not blank */\r

-                       #if defined(RAMPZ)\r
+                       #if (FLASHEND > 0xFFFF)\r

                        if (pgm_read_byte_far(CurrFlashAddress) != 0xFF)\r
                        #else\r
                        if (pgm_read_byte(CurrFlashAddress) != 0xFF)\r
                        if (pgm_read_byte_far(CurrFlashAddress) != 0xFF)\r
                        #else\r
                        if (pgm_read_byte(CurrFlashAddress) != 0xFF)\r


@@ -639,7 +640,7 @@ static void ProcessWriteCommand(void)
                                {\r
                                        uint8_t  Bytes[2];\r
                                        AppPtr_t FuncPtr;\r
                                {\r
                                        uint8_t  Bytes[2];\r
                                        AppPtr_t FuncPtr;\r

-                               } Address = {Bytes: {SentCommand.Data[4], SentCommand.Data[3]}};\r
+                               } Address = {.Bytes = {SentCommand.Data[4], SentCommand.Data[3]}};\r

 \r
                                AppStartPtr = Address.FuncPtr;\r
                                \r
 \r
                                AppStartPtr = Address.FuncPtr;\r
                                \r