Added DataflashManager_WriteBlocks_RAM() and DataflashManager_ReadBlocks_RAM() functi...

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

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index 654eabd..0add977 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -71,8 +71,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r
        \r
        /* Relocate the interrupt vector table to the bootloader section */\r
        MCUCR = (1 << IVCE);\r
@@ -167,6 +167,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                \r
                                Endpoint_ClearSetupIN();\r
                                \r
+                               /* Acknowledge status stage */\r
                                while (!(Endpoint_IsSetupOUTReceived()));\r
                                Endpoint_ClearSetupOUT();\r
                        }\r
@@ -184,6 +185,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 \r
                                Endpoint_ClearSetupOUT();\r
 \r
+                               /* Acknowledge status stage */\r
                                while (!(Endpoint_IsSetupINReady()));\r
                                Endpoint_ClearSetupIN();\r
                        }\r
@@ -194,6 +196,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        {\r
                                Endpoint_ClearSetupReceived();\r
                                \r
+                               /* Acknowledge status stage */\r
                                while (!(Endpoint_IsSetupINReady()));\r
                                Endpoint_ClearSetupIN();\r
                        }\r
@@ -207,7 +210,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
  *\r
  *  \param Command  Single character AVR910 protocol command indicating what memory operation to perform\r
  */\r
-static void ProgramReadWriteMemoryBlock(const uint8_t Command)\r
+static void ReadWriteMemoryBlock(const uint8_t Command)\r
 {\r
        uint16_t BlockSize;\r
        char     MemoryType;\r
@@ -503,7 +506,7 @@ TASK(CDC_Task)
                else if ((Command == 'B') || (Command == 'g'))\r
                {\r
                        /* Delegate the block write/read to a seperate function for clarity */\r
-                       ProgramReadWriteMemoryBlock(Command);\r
+                       ReadWriteMemoryBlock(Command);\r
                }\r
                else if (Command == 'R')\r
                {\r