.Config =\r
{\r
.DataINPipeNumber = 1,\r
+ .DataINPipeDoubleBank = false,\r
+ \r
.DataOUTPipeNumber = 2,\r
+ .DataOUTPipeDoubleBank = false,\r
},\r
};\r
\r
\r
/** Main program entry point. This routine configures the hardware required by the application, then\r
- * starts the scheduler to run the application tasks.\r
+ * enters a loop to run the application tasks in sequence.\r
*/\r
int main(void)\r
{\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if ((USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful) ||\r
- (ConfigDescriptorSize > sizeof(ConfigDescriptorData)) ||\r
- (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData)))\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
}\r
\r
if (MS_Host_ConfigurePipes(&FlashDisk_MS_Interface,\r
- ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)\r
+ ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)\r
{\r
- printf("Attached Device Not a Valid Mouse.\r\n");\r
+ printf("Attached Device Not a Valid Mass Storage Device.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
break;\r
break;\r
}\r
\r
- printf("Mouse Enumerated.\r\n");\r
+ printf("Mass Storage Device Enumerated.\r\n");\r
USB_HostState = HOST_STATE_Configured;\r
break;\r
case HOST_STATE_Configured:\r
break;\r
}\r
\r
+ printf("Total LUNs: %d - Using first LUN in device.\r\n", (MaxLUNIndex + 1));\r
+ \r
if (MS_Host_ResetMSInterface(&FlashDisk_MS_Interface))\r
{\r
printf("Error resetting Mass Storage interface.\r\n");\r
break;\r
}\r
\r
+ SCSI_Request_Sense_Response_t SenseData;\r
+ if (MS_Host_RequestSense(&FlashDisk_MS_Interface, 0, &SenseData) != 0)\r
+ {\r
+ printf("Error retrieving device sense.\r\n");\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+ USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+ break;\r
+ }\r
+ \r
+ if (MS_Host_PreventAllowMediumRemoval(&FlashDisk_MS_Interface, 0, true))\r
+ {\r
+ printf("Error setting Prevent Device Removal bit.\r\n");\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+ USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+ break;\r
+ }\r
+\r
SCSI_Inquiry_Response_t InquiryData;\r
- if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, &InquiryData))\r
+ if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, 0, &InquiryData))\r
{\r
- printf("Error retreiving device Inquiry data.\r\n");\r
+ printf("Error retrieving device Inquiry data.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
break; \r
\r
printf("Vendor \"%.8s\", Product \"%.16s\"\r\n", InquiryData.VendorID, InquiryData.ProductID);\r
\r
- bool DeviceReady;\r
- printf("Waiting until ready...\r\n"));\r
+ printf("Waiting until ready...\r\n");\r
\r
- do\r
+ for (;;)\r
{\r
- if (MS_Host_TestUnitReady(&FlashDisk_MS_Interface, 0, &DeviceReady))\r
+ uint8_t ErrorCode = MS_Host_TestUnitReady(&FlashDisk_MS_Interface, 0);\r
+ \r
+ if (!(ErrorCode))\r
+ break;\r
+\r
+ /* Check if an error other than a logical command error (device busy) received */\r
+ if (ErrorCode != MS_ERROR_LOGICAL_CMD_FAILED)\r
{\r
printf("Error waiting for device to be ready.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
break;\r
}\r
}\r
- while (!(DeviceReady));\r
\r
- puts_P(PSTR("Retrieving Capacity... "));\r
+ printf("Retrieving Capacity... ");\r
\r
SCSI_Capacity_t DiskCapacity;\r
- if (MS_Host_ReadDeviceCapacity(0, &DiskCapacity))\r
+ if (MS_Host_ReadDeviceCapacity(&FlashDisk_MS_Interface, 0, &DiskCapacity))\r
{\r
printf("Error retrieving device capacity.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
\r
printf("%lu blocks of %lu bytes.\r\n", DiskCapacity.Blocks, DiskCapacity.BlockSize);\r
\r
+ uint8_t BlockBuffer[DiskCapacity.BlockSize];\r
+\r
+ if (MS_Host_ReadDeviceBlocks(&FlashDisk_MS_Interface, 0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer))\r
+ {\r
+ printf("Error reading device block.\r\n");\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+ USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+ break;\r
+ }\r
+ \r
+ printf("\r\nContents of first block:\r\n");\r
+\r
+ for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++)\r
+ {\r
+ uint8_t* ChunkPtr = &BlockBuffer[Chunk << 4];\r
+ \r
+ /* Print out the 16 bytes of the chunk in HEX format */\r
+ for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++)\r
+ {\r
+ char CurrByte = *(ChunkPtr + ByteOffset);\r
+ printf_P(PSTR("%.2X "), CurrByte);\r
+ }\r
+ \r
+ printf(" ");\r
+\r
+ /* Print out the 16 bytes of the chunk in ASCII format */\r
+ for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++)\r
+ {\r
+ char CurrByte = *(ChunkPtr + ByteOffset);\r
+ putchar(isprint(CurrByte) ? CurrByte : '.');\r
+ }\r
+ \r
+ printf("\r\n");\r
+ }\r
+\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
break;\r
projects / pub / USBasp.git / blobdiff