Make Low Level host demos use void pointers for the configuration descriptor, to...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / MassStorage.c

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index 047685c..d1622c1 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -35,7 +35,7 @@
 #include "MassStorage.h"\r
 \r
 uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                                                          uint8_t* DeviceConfigDescriptor)\r
+                                                          void* DeviceConfigDescriptor)\r
 {\r
        uint8_t FoundEndpoints = 0;\r
        \r
@@ -66,7 +66,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, u
                {\r
                        Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
                                           EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
-                                          PIPE_BANK_DOUBLE);\r
+                                          MSInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
                        MSInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
 \r
                        FoundEndpoints |= MS_FOUND_DATAPIPE_IN;\r
@@ -75,7 +75,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, u
                {\r
                        Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
                                           EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
-                                          PIPE_BANK_DOUBLE);\r
+                                          MSInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r
                        MSInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
 \r
                        FoundEndpoints |= MS_FOUND_DATAPIPE_OUT;\r
@@ -86,7 +86,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, u
        return MS_ENUMERROR_NoError;\r
 }\r
 \r
-static uint8_t DComp_NextMSInterface(void* CurrentDescriptor)\r
+static uint8_t DComp_NextMSInterface(void* const CurrentDescriptor)\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
@@ -104,7 +104,7 @@ static uint8_t DComp_NextMSInterface(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
-static uint8_t DComp_NextMSInterfaceEndpoint(void* CurrentDescriptor)\r
+static uint8_t DComp_NextMSInterfaceEndpoint(void* const CurrentDescriptor)\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r