X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d297ea12b706e7099f34f667e43bf1f3de1713e7..1190652c0b210fe24320f8da9bfd5a0e169111d8:/LUFA/Drivers/USB/Class/Host/MassStorage.h

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h
index f347b1993..ff2e9019e 100644
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h
@@ -73,10 +73,10 @@
 				           */
 				struct
 				{
-					bool Active; /**< Indicates if the current interface instance is connected to an attached device, valid
-					              *   after \ref HID_Host_ConfigurePipes() is called and the Host state machine is in the
-					              *   Configured state
-					              */
+					bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
+					                *   after \ref HID_Host_ConfigurePipes() is called and the Host state machine is in the
+					                *   Configured state
+					                */
 					uint8_t InterfaceNumber; /**< Interface index of the HID interface within the attached device */
 
 					uint16_t DataINPipeSize; /**< Size in bytes of the MS interface's IN data pipe */
@@ -322,11 +322,12 @@
 			
 		/* Function Prototypes: */
 			#if defined(INCLUDE_FROM_MS_CLASS_HOST_C)		
-				static uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor);
-				static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor);
+				static uint8_t DComp_NextMSInterface(void* CurrentDescriptor);
+				static uint8_t DComp_NextMSInterfaceEndpoint(void* CurrentDescriptor);
 				
 				static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,
-				                                   MS_CommandBlockWrapper_t* SCSICommandBlock);
+				                                   MS_CommandBlockWrapper_t* SCSICommandBlock,
+				                                   void* BufferPtr);
 				static uint8_t MS_Host_WaitForDataReceived(USB_ClassInfo_MS_Host_t* MSInterfaceInfo);
 				static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, 
                                                        MS_CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr);