X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/782614dbb55addcae8c9d4d9e1ce3dec81287282..e39f3378a21ae5076e8c49bc728c20e436e3a69f:/Projects/Incomplete/StandaloneProgrammer/DiskHost.c?ds=sidebyside

diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
index a0e2521c0..c93029c06 100644
--- a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
+++ b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -39,80 +39,75 @@ USB_ClassInfo_MS_Host_t DiskHost_MS_Interface =
 	{
 		.Config =
 			{
-				.DataINPipeNumber       = 1,
-				.DataINPipeDoubleBank   = false,
-
-				.DataOUTPipeNumber      = 2,
-				.DataOUTPipeDoubleBank  = false,
+				.DataINPipe             =
+					{
+						.Address        = (PIPE_DIR_IN  | 1),
+						.Banks          = 1,
+					},
+				.DataOUTPipe            =
+					{
+						.Address        = (PIPE_DIR_OUT | 2),
+						.Banks          = 1,
+					},
 			},
 	};
 
 
 void DiskHost_USBTask(void)
 {
-	if (USB_HostState == HOST_STATE_Addressed)
+	MS_Host_USBTask(&DiskHost_MS_Interface);
+}
+
+void EVENT_USB_Host_DeviceEnumerationComplete(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+
+	uint16_t ConfigDescriptorSize;
+	uint8_t  ConfigDescriptorData[512];
+
+	if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
+										   sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
 	{
-		LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
-
-		uint16_t ConfigDescriptorSize;
-		uint8_t  ConfigDescriptorData[512];
-
-		if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
-											   sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
-		{
-			LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-			USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-			return;
-		}
-
-		if (MS_Host_ConfigurePipes(&DiskHost_MS_Interface,
-		                           ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)
-		{
-			LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-			USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-			return;
-		}
-
-		if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
-		{
-			LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-			USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-			return;
-		}
-
-		uint8_t MaxLUNIndex;
-		if (MS_Host_GetMaxLUN(&DiskHost_MS_Interface, &MaxLUNIndex))
-		{
-			LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-			USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-			return;
-		}
-
-		if (MS_Host_ResetMSInterface(&DiskHost_MS_Interface))
-		{
-			LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-			USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-			return;
-		}
-
-		USB_HostState = HOST_STATE_Configured;
-
-		/* Note: For the RequestSense call to work, the host state machine must be in the
-		 *       Configured state, or the call will be aborted */
-		SCSI_Request_Sense_Response_t SenseData;
-		if (MS_Host_RequestSense(&DiskHost_MS_Interface, 0, &SenseData) != 0)
-		{
-			LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-			USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-			return;
-		}
-
-		pf_mount(&DiskFATState);
-
-		LEDs_SetAllLEDs(LEDMASK_USB_READY);
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
 	}
 
-	MS_Host_USBTask(&DiskHost_MS_Interface);
+	if (MS_Host_ConfigurePipes(&DiskHost_MS_Interface,
+							   ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	uint8_t MaxLUNIndex;
+	if (MS_Host_GetMaxLUN(&DiskHost_MS_Interface, &MaxLUNIndex))
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	if (MS_Host_ResetMSInterface(&DiskHost_MS_Interface))
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	SCSI_Request_Sense_Response_t SenseData;
+	if (MS_Host_RequestSense(&DiskHost_MS_Interface, 0, &SenseData) != 0)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	pf_mount(&DiskFATState);
+
+	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
 void EVENT_USB_Host_DeviceAttached(void)