Make HID device class driver reselect the correct endpoint after the user callbacks...

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

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index cbcfd7e..925385d 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -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
@@ -116,19 +115,10 @@ void ResetHardware(void)
        boot_rww_enable();\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
-void EVENT_USB_Disconnect(void)\r
-{\r
-       /* Upon disconnection, run user application */\r
-       RunBootloader = false;\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
-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        /* Setup CDC Notification, Rx and Tx Endpoints */\r
        Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
@@ -144,11 +134,11 @@ void EVENT_USB_ConfigurationChanged(void)
                                   ENDPOINT_BANK_SINGLE);\r
 }\r
 \r
-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r
  *  control requests that are not handled internally by the USB library, so that they can be handled appropriately\r
  *  for the application.\r
  */\r
-void EVENT_USB_UnhandledControlPacket(void)\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r
 {\r
        uint8_t* LineCodingData = (uint8_t*)&LineCoding;\r
 \r
@@ -235,15 +225,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 \r
                while (BlockSize--)\r
                {\r
-                       if (MemoryType == 'E')\r
-                       {\r
-                               /* Read the next EEPROM byte into the endpoint */\r
-                               WriteNextResponseByte(eeprom_read_byte((uint8_t*)(uint16_t)(CurrAddress >> 1)));\r
-\r
-                               /* Increment the address counter after use */\r
-                               CurrAddress += 2;\r
-                       }\r
-                       else\r
+                       if (MemoryType == 'F')\r
                        {\r
                                /* Read the next FLASH byte from the current FLASH page */\r
                                #if (FLASHEND > 0xFFFF)\r
@@ -258,6 +240,14 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
                                \r
                                HighByte = !HighByte;\r
                        }\r
+                       else\r
+                       {\r
+                               /* Read the next EEPROM byte into the endpoint */\r
+                               WriteNextResponseByte(eeprom_read_byte((uint8_t*)(uint16_t)(CurrAddress >> 1)));\r
+\r
+                               /* Increment the address counter after use */\r
+                               CurrAddress += 2;\r
+                       }                       \r
                }\r
        }\r
        else\r
@@ -533,7 +523,7 @@ void CDC_Task(void)
                else if (Command == 'D')\r
                {\r
                        /* Read the byte from the endpoint and write it to the EEPROM */\r
-                       eeprom_write_byte((uint8_t*)(uint16_t)(CurrAddress >> 1), FetchNextCommandByte());\r
+                       eeprom_write_byte((uint8_t*)((uint16_t)(CurrAddress >> 1)), FetchNextCommandByte());\r
                        \r
                        /* Increment the address after use */                   \r
                        CurrAddress += 2;\r
@@ -544,7 +534,7 @@ void CDC_Task(void)
                else if (Command == 'd')\r
                {\r
                        /* Read the EEPROM byte and write it to the endpoint */\r
-                       WriteNextResponseByte(eeprom_read_byte((uint8_t*)(uint16_t)(CurrAddress >> 1)));\r
+                       WriteNextResponseByte(eeprom_read_byte((uint8_t*)((uint16_t)(CurrAddress >> 1))));\r
 \r
                        /* Increment the address after use */\r
                        CurrAddress += 2;\r