Add check to Pipe_IsEndpointBound() in the Mass Storage Host mode Class driver to...

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index 1f66aa8..ba281cf 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -113,8 +113,11 @@ static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor)
                uint8_t EndpointType = (DESCRIPTOR_CAST(CurrentDescriptor,\r
                                                        USB_Descriptor_Endpoint_t).Attributes & EP_TYPE_MASK);\r
 \r
                uint8_t EndpointType = (DESCRIPTOR_CAST(CurrentDescriptor,\r
                                                        USB_Descriptor_Endpoint_t).Attributes & EP_TYPE_MASK);\r
 \r

-               if (EndpointType == EP_TYPE_BULK)\r
-                 return DESCRIPTOR_SEARCH_Found;\r
+               if ((EndpointType == EP_TYPE_BULK) &&\r
+                   (!(Pipe_IsEndpointBound(CurrentEndpoint->EndpointAddress))))\r
+               {\r
+                       return DESCRIPTOR_SEARCH_Found;\r
+               }\r

        }\r
        else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
        }\r
        else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 639e4ee..ae592fd 100644 (file)
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -12,6 +12,7 @@
   *  or post your suggestion as an enhancement request to the project bug tracker.\r
   *\r
   *  <b>Targeted for This Release:</b>\r
   *  or post your suggestion as an enhancement request to the project bug tracker.\r
   *\r
   *  <b>Targeted for This Release:</b>\r

+  *  - Simplify Mass Storage Host LowLevel SCSI demo\r

   *  - Finish Host Mode Class Drivers\r
   *      ( ) Audio\r
   *      (C) CDC\r
   *  - Finish Host Mode Class Drivers\r
   *      ( ) Audio\r
   *      (C) CDC\r