Condensed SCSI command functions in the LowLevel Mass Storage Host demo, to save on FLASH space.

Fixed issue in AVRISP project where the target RESET line was being toggled before it was tristated, causing problems synchronising to some targets (thanks to Mike Alex).

Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c

@@ -84,7 +84,7 @@ int main(void)
 				if (MS_Host_ConfigurePipes(&FlashDisk_MS_Interface,
 				                            ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)
 				{
-					printf("Attached Device Not a Valid Mouse.\r\n");
+					printf("Attached Device Not a Valid Mass Storage Device.\r\n");
 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 					USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 					break;
@@ -113,6 +113,8 @@ int main(void)
 					break;
 				}
 				
+				printf("Total LUNs: %d - Using first LUN in device.\r\n", (MaxLUNIndex + 1));
+				
 				if (MS_Host_ResetMSInterface(&FlashDisk_MS_Interface))
 				{
 					printf("Error resetting Mass Storage interface.\r\n");

Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h

@@ -46,31 +46,34 @@
 
 	/* Macros: */
 		/** Class specific request to reset the Mass Storage interface of the attached device */
-		#define REQ_MassStorageReset             0xFF
+		#define REQ_MassStorageReset                0xFF
 
 		/** Class specific request to retrieve the maximum Logical Unit Number (LUN) index of the attached device */
-		#define REQ_GetMaxLUN                    0xFE
+		#define REQ_GetMaxLUN                       0xFE
 
 		/** Command Block Wrapper signature byte, for verification of valid CBW blocks */
-		#define CBW_SIGNATURE                    0x43425355UL
+		#define CBW_SIGNATURE                       0x43425355UL
 
 		/** Command Static Wrapper signature byte, for verification of valid CSW blocks */
-		#define CSW_SIGNATURE                    0x53425355UL
+		#define CSW_SIGNATURE                       0x53425355UL
 		
 		/** Data direction mask for the Flags field of a CBW, indicating Host-to-Device transfer direction */
-		#define COMMAND_DIRECTION_DATA_OUT       (0 << 7)
+		#define COMMAND_DIRECTION_DATA_OUT          (0 << 7)
 
 		/** Data direction mask for the Flags field of a CBW, indicating Device-to-Host transfer direction */
-		#define COMMAND_DIRECTION_DATA_IN        (1 << 7)
+		#define COMMAND_DIRECTION_DATA_IN           (1 << 7)
 		
 		/** Timeout period between the issuing of a CBW to a device, and the reception of the first packet */
-		#define COMMAND_DATA_TIMEOUT_MS          2000
+		#define COMMAND_DATA_TIMEOUT_MS             2000
 
 		/** Pipe number of the Mass Storage data IN pipe */
-		#define MASS_STORE_DATA_IN_PIPE          1
+		#define MASS_STORE_DATA_IN_PIPE             1
 
 		/** Pipe number of the Mass Storage data OUT pipe */
-		#define MASS_STORE_DATA_OUT_PIPE         2
+		#define MASS_STORE_DATA_OUT_PIPE            2
+		
+		/** Additional error code for Mass Storage functions when a device returns a logical command failure */
+		#define MASS_STORE_SCSI_COMMAND_FAILED      0xC0
 
 	/* Type defines: */
 		/** Type define for a Mass Storage class Command Block Wrapper, used to wrap SCSI
@@ -78,17 +81,13 @@
 		 */
 		typedef struct
 		{
-			struct
-			{
-				uint32_t Signature; /**< Command block signature, always equal to CBW_SIGNATURE */
-				uint32_t Tag; /**< Current CBW tag, to positively associate a CBW with a CSW */
-				uint32_t DataTransferLength; /**< Length of data to transfer, following the CBW */
-				uint8_t  Flags; /**< Block flags, equal to one of the COMMAND_DIRECTION_DATA_* macros */
-				uint8_t  LUN; /**< Logical Unit Number the CBW is addressed to in the device */
-				uint8_t  SCSICommandLength; /**< Length of the SCSI command in the CBW */
-			} Header;
-			
-			uint8_t SCSICommandData[16]; /**< SCSI command to issue to the device */
+			uint32_t Signature; /**< Command block signature, always equal to CBW_SIGNATURE */
+			uint32_t Tag; /**< Current CBW tag, to positively associate a CBW with a CSW (filled automatically) */
+			uint32_t DataTransferLength; /**< Length of data to transfer, following the CBW */
+			uint8_t  Flags; /**< Block flags, equal to one of the COMMAND_DIRECTION_DATA_* macros */
+			uint8_t  LUN; /**< Logical Unit Number the CBW is addressed to in the device */
+			uint8_t  SCSICommandLength; /**< Length of the SCSI command in the CBW */
+			uint8_t  SCSICommandData[16]; /**< SCSI command to issue to the device */
 		} CommandBlockWrapper_t;
 		
 		/** Type define for a Mass Storage class Command Status Wrapper, used to wrap SCSI
@@ -183,23 +182,20 @@
 			Command_Fail = 1, /**< Command failed to complete successfully */
 			Phase_Error  = 2 /**< Phase error while processing the issued command */
 		};
-		
-	/* External Variables: */
-		extern CommandStatusWrapper_t SCSICommandStatus;
-		
+	
 	/* Function Prototypes: */
 		#if defined(INCLUDE_FROM_MASSSTORE_COMMANDS_C)
-			static uint8_t MassStore_SendCommand(void);
+			static uint8_t MassStore_SendCommand(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr);
 			static uint8_t MassStore_WaitForDataReceived(void);
-			static uint8_t MassStore_SendReceiveData(void* BufferPtr) ATTR_NON_NULL_PTR_ARG(1);
-			static uint8_t MassStore_GetReturnedStatus(void);
+			static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(1);
+			static uint8_t MassStore_GetReturnedStatus(CommandStatusWrapper_t* SCSICommandStatus) ATTR_NON_NULL_PTR_ARG(1);
 		#endif
 		
 		uint8_t MassStore_MassStorageReset(void);
 		uint8_t MassStore_GetMaxLUN(uint8_t* const MaxLUNIndex);
-		uint8_t MassStore_RequestSense(const uint8_t LUNIndex, const SCSI_Request_Sense_Response_t* const SensePtr)
+		uint8_t MassStore_RequestSense(const uint8_t LUNIndex, SCSI_Request_Sense_Response_t* const SensePtr)
 		                               ATTR_NON_NULL_PTR_ARG(2);
-		uint8_t MassStore_Inquiry(const uint8_t LUNIndex, const SCSI_Inquiry_Response_t* const InquiryPtr)
+		uint8_t MassStore_Inquiry(const uint8_t LUNIndex, SCSI_Inquiry_Response_t* const InquiryPtr)
 		                               ATTR_NON_NULL_PTR_ARG(2);
 		uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAddress,
 		                                  const uint8_t Blocks, const uint16_t BlockSize, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5);

Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c

@@ -182,7 +182,7 @@ void MassStorage_Task(void)
 			/* Send the request, display error and wait for device detach if request fails */
 			if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
 			{	
-				ShowDiskReadError(PSTR("Get Max LUN"), false, ErrorCode);
+				ShowDiskReadError(PSTR("Get Max LUN"), ErrorCode);
 
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
@@ -194,7 +194,7 @@ void MassStorage_Task(void)
 			/* Reset the Mass Storage device interface, ready for use */
 			if ((ErrorCode = MassStore_MassStorageReset()) != HOST_SENDCONTROL_Successful)
 			{
-				ShowDiskReadError(PSTR("Mass Storage Reset"), false, ErrorCode);
+				ShowDiskReadError(PSTR("Mass Storage Reset"), ErrorCode);
 				
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
@@ -203,16 +203,17 @@ void MassStorage_Task(void)
 			/* Get sense data from the device - many devices will not accept any other commands until the sense data
 			 * is read - both on start-up and after a failed command */
 			SCSI_Request_Sense_Response_t SenseData;
-			if (((ErrorCode = MassStore_RequestSense(0, &SenseData)) != 0) || (SCSICommandStatus.Status != Command_Pass))
+			if ((ErrorCode = MassStore_RequestSense(0, &SenseData)) != 0)
 			{
-				ShowDiskReadError(PSTR("Request Sense"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				ShowDiskReadError(PSTR("Request Sense"), ErrorCode);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 			
 			/* Set the prevent removal flag for the device, allowing it to be accessed */
-			if (((ErrorCode = MassStore_PreventAllowMediumRemoval(0, true)) != 0) || (SCSICommandStatus.Status != Command_Pass))
+			if ((ErrorCode = MassStore_PreventAllowMediumRemoval(0, true)) != 0)
 			{
-				ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				ShowDiskReadError(PSTR("Prevent/Allow Medium Removal"), ErrorCode);
 				
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
@@ -220,9 +221,9 @@ void MassStorage_Task(void)
 
 			/* Get inquiry data from the device */
 			SCSI_Inquiry_Response_t InquiryData;
-			if (((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0) || (SCSICommandStatus.Status != Command_Pass))
+			if ((ErrorCode = MassStore_Inquiry(0, &InquiryData)) != 0)
 			{
-				ShowDiskReadError(PSTR("Inquiry"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				ShowDiskReadError(PSTR("Inquiry"), ErrorCode);
 				
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
@@ -234,23 +235,30 @@ void MassStorage_Task(void)
 			/* Wait until disk ready */
 			puts_P(PSTR("Waiting until ready.."));
 
-			do
+			for (;;)
 			{
 				Serial_TxByte('.');
-				
+
 				/* Abort if device removed */
 				if (USB_HostState == HOST_STATE_Unattached)
 				  break;
 
-				if ((ErrorCode = MassStore_TestUnitReady(0)) != PIPE_RWSTREAM_NoError)
+				/* Check to see if the attached device is ready for new commands */
+				ErrorCode = MassStore_TestUnitReady(0);
+				  
+				/* If attached device is ready, abort the loop */
+				if (!(ErrorCode))
+				  break;
+
+				/* If an error othe than a logical command failure (indicating device busy) returned, abort */
+				if (ErrorCode != MASS_STORE_SCSI_COMMAND_FAILED)
 				{
-					ShowDiskReadError(PSTR("Test Unit Ready"), false, ErrorCode);
+					ShowDiskReadError(PSTR("Test Unit Ready"), ErrorCode);
 
 					USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 					break;
 				}
 			}
-			while (SCSICommandStatus.Status != Command_Pass);
 
 			puts_P(PSTR("\r\nRetrieving Capacity... "));
 
@@ -258,9 +266,9 @@ void MassStorage_Task(void)
 			SCSI_Capacity_t DiskCapacity;
 
 			/* Retrieve disk capacity */
-			if (((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0) || (SCSICommandStatus.Status != Command_Pass))
+			if ((ErrorCode = MassStore_ReadCapacity(0, &DiskCapacity)) != 0)
 			{
-				ShowDiskReadError(PSTR("Read Capacity"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				ShowDiskReadError(PSTR("Read Capacity"), ErrorCode);
 				
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
@@ -273,10 +281,9 @@ void MassStorage_Task(void)
 			uint8_t BlockBuffer[DiskCapacity.BlockSize];
 
 			/* Read in the first 512 byte block from the device */
-			if (((ErrorCode = MassStore_ReadDeviceBlock(0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) ||
-			    (SCSICommandStatus.Status != Command_Pass))
+			if ((ErrorCode = MassStore_ReadDeviceBlock(0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0)
 			{
-				ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+				ShowDiskReadError(PSTR("Read Device Block"), ErrorCode);
 				
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
@@ -320,15 +327,18 @@ void MassStorage_Task(void)
 				if (USB_HostState == HOST_STATE_Unattached)
 				  break;
 			}
+
+			/* Abort if device removed */
+			if (USB_HostState == HOST_STATE_Unattached)
+			  break;
 			
 			/* Print out the entire disk contents in ASCII format */
-			for (uint32_t CurrBlock = 0; CurrBlock < DiskCapacity.Blocks; CurrBlock++)
+			for (uint32_t CurrBlockAddress = 0; CurrBlockAddress < DiskCapacity.Blocks; CurrBlockAddress++)
 			{
 				/* Read in the next block of data from the device */
-				if (((ErrorCode = MassStore_ReadDeviceBlock(0, CurrBlock, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0) ||
-				    (SCSICommandStatus.Status != Command_Pass))
+				if ((ErrorCode = MassStore_ReadDeviceBlock(0, CurrBlockAddress, 1, DiskCapacity.BlockSize, BlockBuffer)) != 0)
 				{
-					ShowDiskReadError(PSTR("Read Device Block"), (SCSICommandStatus.Status != Command_Pass), ErrorCode);
+					ShowDiskReadError(PSTR("Read Device Block"), ErrorCode);
 					
 					USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 					break;
@@ -360,17 +370,15 @@ void MassStorage_Task(void)
  *  printing error codes to the serial port and waiting until the device is removed before
  *  continuing.
  *
- *  \param[in] CommandString      ASCII string located in PROGMEM space indicating what operation failed
- *  \param[in] FailedAtSCSILayer  Indicates if the command failed at the (logical) SCSI layer or at the physical USB layer
- *  \param[in] ErrorCode          Error code of the function which failed to complete successfully
+ *  \param[in] CommandString  ASCII string located in PROGMEM space indicating what operation failed
+ *  \param[in] ErrorCode      Error code of the function which failed to complete successfully
  */
-void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)
+void ShowDiskReadError(char* CommandString, uint8_t ErrorCode)
 {
-	if (FailedAtSCSILayer)
+	if (ErrorCode == MASS_STORE_SCSI_COMMAND_FAILED)
 	{
 		/* Display the error code */
 		printf_P(PSTR(ESC_FG_RED "SCSI command error (%S).\r\n"), CommandString);
-		printf_P(PSTR("  -- Status Code: %d" ESC_FG_WHITE), ErrorCode);
 	}
 	else
 	{

Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h

@@ -82,6 +82,6 @@
 		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
 		void EVENT_USB_Host_DeviceEnumerationComplete(void);
 
-		void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode);
+		void ShowDiskReadError(char* CommandString, uint8_t ErrorCode);
 
 #endif

LUFA/Drivers/USB/Class/Host/MassStorage.c

@@ -110,8 +110,10 @@ static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor)
 {
 	if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)
 	{
-		uint8_t EndpointType = (DESCRIPTOR_CAST(CurrentDescriptor,
-		                                        USB_Descriptor_Endpoint_t).Attributes & EP_TYPE_MASK);
+		USB_Descriptor_Endpoint_t* CurrentEndpoint = DESCRIPTOR_PCAST(CurrentDescriptor,
+		                                                              USB_Descriptor_Endpoint_t);
+
+		uint8_t EndpointType = (CurrentEndpoint->Attributes & EP_TYPE_MASK);
 
 		if ((EndpointType == EP_TYPE_BULK) &&
 		    (!(Pipe_IsEndpointBound(CurrentEndpoint->EndpointAddress))))
@@ -137,7 +139,7 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, MS_
 {
 	uint8_t ErrorCode = PIPE_RWSTREAM_NoError;
 
-	SCSICommandBlock->Tag = MSInterfaceInfo->State.TransactionTag++;
+	SCSICommandBlock->Tag = ++MSInterfaceInfo->State.TransactionTag;
 
 	if (MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)
 	  MSInterfaceInfo->State.TransactionTag = 1;

LUFA/ManPages/ChangeLog.txt

@@ -28,6 +28,7 @@
   *  - Added non-null function parameter pointer restrictions to USB Class drivers to improve user code reliability
   *  - Added new "Common" section to the class drivers, to hold all mode-independant definitions for clarity
   *  - Moved SCSI command/sense constants into the Mass Storage Class driver, instead of the user-code
+  *  - Altered the SCSI commands in the LowLevel Mass Storage Host to save on FLASH space by reducing function calls
   *
   *  <b>Fixed:</b>
   *  - Fixed possible lockup in the CDC device class driver, when the host sends data that is a multiple of the

Projects/AVRISP/Lib/V2ProtocolTarget.c

@@ -92,8 +92,8 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
 	}
 	else
 	{
-		RESET_LINE_PORT &= ~RESET_LINE_MASK;
 		RESET_LINE_DDR  &= ~RESET_LINE_MASK;
+		RESET_LINE_PORT &= ~RESET_LINE_MASK;
 	}
 }