X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d1e52660368d34d693131f6aff3c8fd8584162e5..f9f1bcc25c17b031029200cd9648d76d4ee39dc4:/LUFA/Drivers/USB/Class/Device/MassStorage.c

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c
index 1c41f6046..04c63fca7 100644
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c
@@ -28,17 +28,20 @@
   this software.
 */
 
-#define  INCLUDE_FROM_MS_CLASS_C
+#include "../../HighLevel/USBMode.h"
+#if defined(USB_CAN_BE_DEVICE)
+
+#define  INCLUDE_FROM_MS_CLASS_DEVICE_C
 #include "MassStorage.h"
 
-static USB_ClassInfo_MS_t* CallbackMSInterfaceInfo;
+static USB_ClassInfo_MS_Device_t* CallbackMSInterfaceInfo;
 
-void USB_MS_ProcessControlPacket(USB_ClassInfo_MS_t* MSInterfaceInfo)
+void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
 	if (!(Endpoint_IsSETUPReceived()))
 	  return;
 	  
-	if (USB_ControlRequest.wIndex != MSInterfaceInfo->InterfaceNumber)
+	if (USB_ControlRequest.wIndex != MSInterfaceInfo->Config.InterfaceNumber)
 	  return;
 
 	switch (USB_ControlRequest.bRequest)
@@ -48,10 +51,9 @@ void USB_MS_ProcessControlPacket(USB_ClassInfo_MS_t* MSInterfaceInfo)
 			{
 				Endpoint_ClearSETUP();
 
-				MSInterfaceInfo->IsMassStoreReset = true;			
+				MSInterfaceInfo->State.IsMassStoreReset = true;			
 
-				while (!(Endpoint_IsINReady()));
-				Endpoint_ClearIN();
+				Endpoint_ClearStatusStage();
 			}
 
 			break;
@@ -60,29 +62,29 @@ void USB_MS_ProcessControlPacket(USB_ClassInfo_MS_t* MSInterfaceInfo)
 			{
 				Endpoint_ClearSETUP();
 
-				Endpoint_Write_Byte(MSInterfaceInfo->TotalLUNs - 1);
-				
+				Endpoint_Write_Byte(MSInterfaceInfo->Config.TotalLUNs - 1);				
 				Endpoint_ClearIN();
 				
-				while (!(Endpoint_IsOUTReceived()));
-				Endpoint_ClearOUT();
+				Endpoint_ClearStatusStage();
 			}
 			
 			break;
 	}
 }
 
-bool USB_MS_ConfigureEndpoints(USB_ClassInfo_MS_t* MSInterfaceInfo)
+bool MS_Device_ConfigureEndpoints(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
-	if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,
-							         ENDPOINT_DIR_IN, MSInterfaceInfo->DataINEndpointSize,
+	memset(&MSInterfaceInfo->State, 0x00, sizeof(MSInterfaceInfo->State));
+
+	if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,
+							         ENDPOINT_DIR_IN, MSInterfaceInfo->Config.DataINEndpointSize,
 							         ENDPOINT_BANK_SINGLE)))
 	{
 		return false;
 	}
 
-	if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,
-	                                 ENDPOINT_DIR_OUT, MSInterfaceInfo->DataOUTEndpointSize,
+	if (!(Endpoint_ConfigureEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,
+	                                 ENDPOINT_DIR_OUT, MSInterfaceInfo->Config.DataOUTEndpointSize,
 	                                 ENDPOINT_BANK_SINGLE)))
 	{
 		return false;
@@ -91,118 +93,125 @@ bool USB_MS_ConfigureEndpoints(USB_ClassInfo_MS_t* MSInterfaceInfo)
 	return true;
 }
 
-void USB_MS_USBTask(USB_ClassInfo_MS_t* MSInterfaceInfo)
+void MS_Device_USBTask(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
-	if (!(USB_IsConnected))
+	if (USB_DeviceState != DEVICE_STATE_Configured)
 	  return;
 
-	Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);
+	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);
 		
 	if (Endpoint_IsReadWriteAllowed())
 	{
-		if (USB_MS_ReadInCommandBlock(MSInterfaceInfo))
+		if (MS_Device_ReadInCommandBlock(MSInterfaceInfo))
 		{
-			if (MSInterfaceInfo->CommandBlock.Flags & COMMAND_DIRECTION_DATA_IN)
-			  Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);
+			if (MSInterfaceInfo->State.CommandBlock.Flags & MS_COMMAND_DIR_DATA_IN)
+			  Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);
 			  
-			MSInterfaceInfo->CommandStatus.Status              = CALLBACK_USB_MS_SCSICommandReceived(MSInterfaceInfo) ?
-			                                                      Command_Pass : Command_Fail;
-			MSInterfaceInfo->CommandStatus.Signature           = CSW_SIGNATURE;
-			MSInterfaceInfo->CommandStatus.Tag                 = MSInterfaceInfo->CommandBlock.Tag;
-			MSInterfaceInfo->CommandStatus.DataTransferResidue = MSInterfaceInfo->CommandBlock.DataTransferLength;
-
-			if ((MSInterfaceInfo->CommandStatus.Status == Command_Fail) && (MSInterfaceInfo->CommandStatus.DataTransferResidue))
-			  Endpoint_StallTransaction();
+			MSInterfaceInfo->State.CommandStatus.Status = CALLBACK_MS_Device_SCSICommandReceived(MSInterfaceInfo) ?
+			                                                                 SCSI_Command_Pass : SCSI_Command_Fail;
+			MSInterfaceInfo->State.CommandStatus.Signature           = MS_CSW_SIGNATURE;
+			MSInterfaceInfo->State.CommandStatus.Tag                 = MSInterfaceInfo->State.CommandBlock.Tag;
+			MSInterfaceInfo->State.CommandStatus.DataTransferResidue = MSInterfaceInfo->State.CommandBlock.DataTransferLength;
+
+			if ((MSInterfaceInfo->State.CommandStatus.Status == SCSI_Command_Fail) &&
+			    (MSInterfaceInfo->State.CommandStatus.DataTransferResidue))
+			{
+				Endpoint_StallTransaction();
+			}
 			
-			USB_MS_ReturnCommandStatus(MSInterfaceInfo);
+			MS_Device_ReturnCommandStatus(MSInterfaceInfo);
 			
-			if (MSInterfaceInfo->IsMassStoreReset)
+			if (MSInterfaceInfo->State.IsMassStoreReset)
 			{
-				Endpoint_ResetFIFO(MSInterfaceInfo->DataOUTEndpointNumber);
-				Endpoint_ResetFIFO(MSInterfaceInfo->DataINEndpointNumber);
+				Endpoint_ResetFIFO(MSInterfaceInfo->Config.DataOUTEndpointNumber);
+				Endpoint_ResetFIFO(MSInterfaceInfo->Config.DataINEndpointNumber);
 				
-				Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);
+				Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);
 				Endpoint_ClearStall();
-				Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);
+				Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);
 				Endpoint_ClearStall();
-
-				MSInterfaceInfo->IsMassStoreReset = false;
 			}
 		}
 	}
+	
+	MSInterfaceInfo->State.IsMassStoreReset = false;
 }
 
-static bool USB_MS_ReadInCommandBlock(USB_ClassInfo_MS_t* MSInterfaceInfo)
+static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
-	Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);
+	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);
 
 	CallbackMSInterfaceInfo = MSInterfaceInfo;
-	Endpoint_Read_Stream_LE(&MSInterfaceInfo->CommandBlock,
-	                        (sizeof(CommandBlockWrapper_t) - MAX_SCSI_COMMAND_LENGTH),
-	                        StreamCallback_AbortOnMassStoreReset);
-
-	if ((MSInterfaceInfo->CommandBlock.Signature         != CBW_SIGNATURE)              ||
-	    (MSInterfaceInfo->CommandBlock.LUN               >= MSInterfaceInfo->TotalLUNs) ||
-		(MSInterfaceInfo->CommandBlock.SCSICommandLength >  MAX_SCSI_COMMAND_LENGTH))
+	Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock,
+	                        (sizeof(MS_CommandBlockWrapper_t) - 16),
+	                        StreamCallback_MS_Device_AbortOnMassStoreReset);
+
+	if ((MSInterfaceInfo->State.CommandBlock.Signature         != MS_CBW_SIGNATURE)                  ||
+	    (MSInterfaceInfo->State.CommandBlock.LUN               >= MSInterfaceInfo->Config.TotalLUNs) ||
+		(MSInterfaceInfo->State.CommandBlock.Flags              & 0x1F)                              ||
+		(MSInterfaceInfo->State.CommandBlock.SCSICommandLength == 0)                                 ||
+		(MSInterfaceInfo->State.CommandBlock.SCSICommandLength >  16))
 	{
 		Endpoint_StallTransaction();
-		Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);
+		Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);
 		Endpoint_StallTransaction();
 		
 		return false;
 	}
 
 	CallbackMSInterfaceInfo = MSInterfaceInfo;
-	Endpoint_Read_Stream_LE(&MSInterfaceInfo->CommandBlock.SCSICommandData,
-	                        MSInterfaceInfo->CommandBlock.SCSICommandLength,
-	                        StreamCallback_AbortOnMassStoreReset);
+	Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock.SCSICommandData,
+	                        MSInterfaceInfo->State.CommandBlock.SCSICommandLength,
+	                        StreamCallback_MS_Device_AbortOnMassStoreReset);
 							
 	Endpoint_ClearOUT();
 	  
-	if (MSInterfaceInfo->IsMassStoreReset)
+	if (MSInterfaceInfo->State.IsMassStoreReset)
 	  return false;
 
 	return true;
 }
 
-static void USB_MS_ReturnCommandStatus(USB_ClassInfo_MS_t* MSInterfaceInfo)
+static void MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
-	Endpoint_SelectEndpoint(MSInterfaceInfo->DataOUTEndpointNumber);
+	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);
 
 	while (Endpoint_IsStalled())
 	{
 		USB_USBTask();
 
-		if (MSInterfaceInfo->IsMassStoreReset)
+		if (MSInterfaceInfo->State.IsMassStoreReset)
 		  return;
 	}
 
-	Endpoint_SelectEndpoint(MSInterfaceInfo->DataINEndpointNumber);
+	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpointNumber);
 
 	while (Endpoint_IsStalled())
 	{
 		USB_USBTask();
 
-		if (MSInterfaceInfo->IsMassStoreReset)
+		if (MSInterfaceInfo->State.IsMassStoreReset)
 		  return;
 	}
 	
 	CallbackMSInterfaceInfo = MSInterfaceInfo;
-	Endpoint_Write_Stream_LE(&MSInterfaceInfo->CommandStatus, sizeof(CommandStatusWrapper_t),
-	                         StreamCallback_AbortOnMassStoreReset);
+	Endpoint_Write_Stream_LE(&MSInterfaceInfo->State.CommandStatus, sizeof(MS_CommandStatusWrapper_t),
+	                         StreamCallback_MS_Device_AbortOnMassStoreReset);
 	
 	Endpoint_ClearIN();
 
-	if (MSInterfaceInfo->IsMassStoreReset)
+	if (MSInterfaceInfo->State.IsMassStoreReset)
 	  return;
 }
 
-static uint8_t StreamCallback_AbortOnMassStoreReset(void)
+static uint8_t StreamCallback_MS_Device_AbortOnMassStoreReset(void)
 {
-	USB_MS_USBTask(CallbackMSInterfaceInfo);
+	MS_Device_USBTask(CallbackMSInterfaceInfo);
 
-	if (CallbackMSInterfaceInfo->IsMassStoreReset)
+	if (CallbackMSInterfaceInfo->State.IsMassStoreReset)
 	  return STREAMCALLBACK_Abort;
 	else
 	  return STREAMCALLBACK_Continue;
 }
+
+#endif