/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
this software.\r
*/\r
\r
+#define __INCLUDE_FROM_USB_DRIVER\r
#include "../../HighLevel/USBMode.h"\r
#if defined(USB_CAN_BE_HOST)\r
\r
-#define INCLUDE_FROM_MS_CLASS_HOST_C\r
+#define __INCLUDE_FROM_MS_CLASS_HOST_C\r
+#define __INCLUDE_FROM_MS_DRIVER\r
#include "MassStorage.h"\r
\r
uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize,\r
return DESCRIPTOR_SEARCH_NotFound;\r
}\r
\r
-void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)\r
-{\r
- \r
-}\r
-\r
static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, MS_CommandBlockWrapper_t* const SCSICommandBlock,\r
- void* BufferPtr)\r
+ const void* const BufferPtr)\r
{\r
uint8_t ErrorCode = PIPE_RWSTREAM_NoError;\r
\r
- SCSICommandBlock->Tag = ++MSInterfaceInfo->State.TransactionTag;\r
+ SCSICommandBlock->Signature = CBW_SIGNATURE;\r
+ SCSICommandBlock->Tag = ++MSInterfaceInfo->State.TransactionTag;\r
\r
if (MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)\r
MSInterfaceInfo->State.TransactionTag = 1;\r
Pipe_Freeze();\r
\r
if ((BufferPtr != NULL) &&\r
- ((ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, BufferPtr)) != PIPE_RWSTREAM_NoError))\r
+ ((ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr)) != PIPE_RWSTREAM_NoError))\r
{\r
Pipe_Freeze();\r
return ErrorCode;\r
\r
uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint8_t* const MaxLUNIndex)\r
{\r
- uint8_t ErrorCode;\r
+ uint8_t ErrorCode = HOST_SENDCONTROL_Successful;\r
\r
USB_ControlRequest = (USB_Request_Header_t)\r
{\r
Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
\r
if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)\r
- *MaxLUNIndex = 0;\r
+ {\r
+ *MaxLUNIndex = 0;\r
+ ErrorCode = HOST_SENDCONTROL_Successful;\r
+ }\r
\r
return ErrorCode;\r
}\r
\r
MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
{\r
- .Signature = CBW_SIGNATURE,\r
.DataTransferLength = sizeof(SCSI_Inquiry_Response_t),\r
.Flags = COMMAND_DIRECTION_DATA_IN,\r
.LUN = LUNIndex,\r
\r
MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
{\r
- .Signature = CBW_SIGNATURE,\r
.DataTransferLength = 0,\r
.Flags = COMMAND_DIRECTION_DATA_IN,\r
.LUN = LUNIndex,\r
\r
MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
{\r
- .Signature = CBW_SIGNATURE,\r
.DataTransferLength = sizeof(SCSI_Capacity_t),\r
.Flags = COMMAND_DIRECTION_DATA_IN,\r
.LUN = LUNIndex,\r
if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, DeviceCapacity)) != PIPE_RWSTREAM_NoError)\r
return ErrorCode;\r
\r
- DeviceCapacity->Blocks = SwapEndian_32(DeviceCapacity->Blocks);\r
- DeviceCapacity->BlockSize = SwapEndian_32(DeviceCapacity->BlockSize);\r
+ SwapEndian_n(&DeviceCapacity->Blocks, sizeof(DeviceCapacity->Blocks));\r
+ SwapEndian_n(&DeviceCapacity->BlockSize, sizeof(DeviceCapacity->BlockSize));\r
\r
if ((ErrorCode = MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSICommandStatus)) != PIPE_RWSTREAM_NoError)\r
return ErrorCode;\r
\r
MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
{\r
- .Signature = CBW_SIGNATURE,\r
.DataTransferLength = sizeof(SCSI_Request_Sense_Response_t),\r
.Flags = COMMAND_DIRECTION_DATA_IN,\r
.LUN = LUNIndex,\r
\r
MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
{\r
- .Signature = CBW_SIGNATURE,\r
.DataTransferLength = 0,\r
.Flags = COMMAND_DIRECTION_DATA_OUT,\r
.LUN = LUNIndex,\r
\r
MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
{\r
- .Signature = CBW_SIGNATURE,\r
.DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
.Flags = COMMAND_DIRECTION_DATA_IN,\r
.LUN = LUNIndex,\r
}\r
\r
uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex, const uint32_t BlockAddress,\r
- const uint8_t Blocks, const uint16_t BlockSize, void* BlockBuffer)\r
+ const uint8_t Blocks, const uint16_t BlockSize, const void* BlockBuffer)\r
{\r
if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
return HOST_SENDCONTROL_DeviceDisconnected;\r
\r
MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)\r
{\r
- .Signature = CBW_SIGNATURE,\r
.DataTransferLength = ((uint32_t)Blocks * BlockSize),\r
.Flags = COMMAND_DIRECTION_DATA_OUT,\r
.LUN = LUNIndex,\r
projects / pub / USBasp.git / blobdiff