Fix bugs in the new VirtualSerialMassStorage demo (thanks to Martin Degelsegger).

diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
index a2fff65..f5970a4 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
@@ -43,13 +43,13 @@
 \r
        /* Macros: */\r
                /** Endpoint number of the CDC device-to-host notification IN endpoint. */\r
 \r
        /* Macros: */\r
                /** Endpoint number of the CDC device-to-host notification IN endpoint. */\r

-               #define CDC_NOTIFICATION_EPNUM         2\r
+               #define CDC_NOTIFICATION_EPNUM         1\r

 \r
                /** Endpoint number of the CDC device-to-host data IN endpoint. */\r
 \r
                /** Endpoint number of the CDC device-to-host data IN endpoint. */\r

-               #define CDC_TX_EPNUM                   3\r
+               #define CDC_TX_EPNUM                   2\r

 \r
                /** Endpoint number of the CDC host-to-device data OUT endpoint. */\r
 \r
                /** Endpoint number of the CDC host-to-device data OUT endpoint. */\r

-               #define CDC_RX_EPNUM                   4\r
+               #define CDC_RX_EPNUM                   3\r

 \r
                /** Size in bytes of the CDC device-to-host notification IN endpoint. */\r
                #define CDC_NOTIFICATION_EPSIZE        8\r
 \r
                /** Size in bytes of the CDC device-to-host notification IN endpoint. */\r
                #define CDC_NOTIFICATION_EPSIZE        8\r


@@ -58,10 +58,10 @@
                #define CDC_TXRX_EPSIZE                16\r
 \r
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */\r
                #define CDC_TXRX_EPSIZE                16\r
 \r
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */\r

-               #define MASS_STORAGE_IN_EPNUM          3\r
+               #define MASS_STORAGE_IN_EPNUM          4\r

 \r
                /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */\r
 \r
                /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */\r

-               #define MASS_STORAGE_OUT_EPNUM         4\r
+               #define MASS_STORAGE_OUT_EPNUM         5\r

 \r
                /** Size in bytes of the Mass Storage data endpoints. */\r
                #define MASS_STORAGE_IO_EPSIZE         64\r
 \r
                /** Size in bytes of the Mass Storage data endpoints. */\r
                #define MASS_STORAGE_IO_EPSIZE         64\r

diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c b/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
index c536c3c..810cfb8 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
@@ -68,17 +68,17 @@ USB_ClassInfo_MS_Device_t Disk_MS_Interface =
        {\r
                .Config =\r
                        {\r
        {\r
                .Config =\r
                        {\r

-                               .InterfaceNumber           = 0,\r
+                               .InterfaceNumber                = 2,\r

 \r
 \r

-                               .DataINEndpointNumber      = MASS_STORAGE_IN_EPNUM,\r
-                               .DataINEndpointSize        = MASS_STORAGE_IO_EPSIZE,\r
-                               .DataINEndpointDoubleBank  = false,\r
+                               .DataINEndpointNumber           = MASS_STORAGE_IN_EPNUM,\r
+                               .DataINEndpointSize             = MASS_STORAGE_IO_EPSIZE,\r
+                               .DataINEndpointDoubleBank       = false,\r

 \r
 \r

-                               .DataOUTEndpointNumber     = MASS_STORAGE_OUT_EPNUM,\r
-                               .DataOUTEndpointSize       = MASS_STORAGE_IO_EPSIZE,\r
-                               .DataOUTEndpointDoubleBank = false,\r
+                               .DataOUTEndpointNumber          = MASS_STORAGE_OUT_EPNUM,\r
+                               .DataOUTEndpointSize            = MASS_STORAGE_IO_EPSIZE,\r
+                               .DataOUTEndpointDoubleBank      = false,\r

 \r
 \r

-                               .TotalLUNs                 = TOTAL_LUNS,\r
+                               .TotalLUNs                      = TOTAL_LUNS,\r

                        },\r
        };\r
 \r
                        },\r
        };\r
 \r

diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.txt b/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.txt
index aa9a74f..af13cdd 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.txt
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.txt
@@ -13,7 +13,6 @@
  *  - Series 7 USB AVRs (AT90USBxxx7)\r
  *  - Series 6 USB AVRs (AT90USBxxx6)\r
  *  - Series 4 USB AVRs (ATMEGAxxU4)\r
  *  - Series 7 USB AVRs (AT90USBxxx7)\r
  *  - Series 6 USB AVRs (AT90USBxxx6)\r
  *  - Series 4 USB AVRs (ATMEGAxxU4)\r

- *  - Series 2 USB AVRs (AT90USBxx2, ATMEGAxxU2)\r

  *\r
  *  \section Sec_Info USB Information:\r
  *\r
  *\r
  *  \section Sec_Info USB Information:\r
  *\r

diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.c b/LUFA/Drivers/USB/Core/HostStandardReq.c
index f74490f..d2523fd 100644 (file)
--- a/LUFA/Drivers/USB/Core/HostStandardReq.c
+++ b/LUFA/Drivers/USB/Core/HostStandardReq.c
@@ -54,8 +54,11 @@ uint8_t USB_Host_SendControlRequest(void* const BufferPtr)
 
        Pipe_Unfreeze();
 
 
        Pipe_Unfreeze();
 

-       for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Request_Header_t); HeaderByte++)
-         Pipe_Write_Byte(*(HeaderStream++));
+       Pipe_Write_Byte(USB_ControlRequest.bmRequestType);
+       Pipe_Write_Byte(USB_ControlRequest.bRequest);
+       Pipe_Write_Word_LE(USB_ControlRequest.wValue);
+       Pipe_Write_Word_LE(USB_ControlRequest.wIndex);
+       Pipe_Write_Word_LE(USB_ControlRequest.wLength);

 
        Pipe_ClearSETUP();
 
 
        Pipe_ClearSETUP();