Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest...

Fixed documentation showing incorrect USB mode support on the supported AVRs list.

diff --git a/Demos/Device/DualCDC/DualCDC.c b/Demos/Device/DualCDC/DualCDC.c
index 4185a76..9750ea2 100644 (file)
--- a/Demos/Device/DualCDC/DualCDC.c
+++ b/Demos/Device/DualCDC/DualCDC.c
@@ -186,16 +186,8 @@ EVENT_HANDLER(USB_ConfigurationChanged)
  */\r
 EVENT_HANDLER(USB_UnhandledControlPacket)\r
 {\r
-       uint8_t* LineCodingData;\r
-\r
-       /* Discard the unused wValue parameter */\r
-       Endpoint_Discard_Word();\r
-\r
-       /* wIndex indicates the interface being controlled */\r
-       uint16_t wIndex = Endpoint_Read_Word_LE();\r
-\r
        /* Determine which interface's Line Coding data is being set from the wIndex parameter */\r
-       LineCodingData = (wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2;\r
+       uint8_t* LineCodingData = (USB_ControlRequest.wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2;\r
 \r
        /* Process CDC specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r

diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.c b/Demos/Device/RNDISEthernet/RNDISEthernet.c
index 8338cdd..96fef39 100644 (file)
--- a/Demos/Device/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.c
@@ -140,15 +140,6 @@ EVENT_HANDLER(USB_ConfigurationChanged)
  */\r
 EVENT_HANDLER(USB_UnhandledControlPacket)\r
 {\r
-       /* Discard the unused wValue parameter */\r
-       Endpoint_Discard_Word();\r
-\r
-       /* Discard the unused wIndex parameter */\r
-       Endpoint_Discard_Word();\r
-\r
-       /* Read in the wLength parameter */\r
-       uint16_t wLength = Endpoint_Read_Word_LE();\r
-\r
        /* Process RNDIS class commands */\r
        switch (USB_ControlRequest.bRequest)\r
        {\r
@@ -159,7 +150,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Read in the RNDIS message into the message buffer */\r
-                               Endpoint_Read_Control_Stream_LE(RNDISMessageBuffer, wLength);\r
+                               Endpoint_Read_Control_Stream_LE(RNDISMessageBuffer, USB_ControlRequest.wLength);\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
                                Endpoint_ClearIN();\r

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index bca8d9f..c71b088 100644 (file)
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -8,6 +8,11 @@
   *\r
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX\r
   *\r
+  *  - Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest structure for control request data\r
+  *  - Fixed documentation showing incorrect USB mode support on the supported AVRs list\r
+  *\r
+  *  \section Sec_ChangeLog090510 Version 090510\r
+  *\r
   *  - Added new GenericHIDHost demo\r
   *  - Corrections to the KeyboardHost and MouseHost demos' pipe handling to freeze and unfreeze the data pipes at the point of use\r
   *  - KeyboardHost, MouseHost and GenericHIDHost demos now save and restore the currently selected pipe inside the pipe ISR\r

diff --git a/LUFA/MainPage.txt b/LUFA/MainPage.txt
index 9dc8a18..8ee8f95 100644 (file)
--- a/LUFA/MainPage.txt
+++ b/LUFA/MainPage.txt
@@ -15,10 +15,10 @@
  *  microcontrollers, released under the MIT license.\r
  *\r
  *  Currently supported AVR models:\r
- *   - AT90USB1286 (USB Host and Device)\r
+ *   - AT90USB1286 (USB Device Only)\r
  *   - AT90USB1287 (USB Host and Device)\r
  *   - AT90USB646 (USB Device Only)\r
- *   - AT90USB647 (USB Device Only)\r
+ *   - AT90USB647 (USB Host and Device)\r
  *   - AT90USB162 (USB Device Only)\r
  *   - AT90USB82 (USB Device Only)\r
  *   - ATMEGA16U4 (USB Device Only)\r

diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt
index 6439419..891c5b2 100644 (file)
--- a/LUFA/MigrationInformation.txt
+++ b/LUFA/MigrationInformation.txt
@@ -10,7 +10,10 @@
  *  to the next version released. It does not indicate all new additions to the library in each version change, only\r
  *  areas relevant to making older projects compatible with the API changes of each new release.\r
  *\r
- * \section Sec_MigrationXXXXXX Migrating from 090401 to XXXXXX\r
+ * \section Sec_MigrationXXXXXX Migrating from 090510 to XXXXXX\r
+ *\r
+ *\r
+ * \section Sec_Migration090510 Migrating from 090401 to 090510\r
  *\r
  *  <b>All</b>\r
  *    - The ButtLoadTag.h header has been removed, as it was never used for its intended purpose. Projects should either remove all\r