Remove non-functional maintenance link check.

[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / DiskHost.c

diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
index e7831cd..c93029c 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
+++ b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  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 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -39,79 +39,75 @@ USB_ClassInfo_MS_Host_t DiskHost_MS_Interface =
        {
                .Config =
                        {
        {
                .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)
 {
 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_ERROR);
+               return;
+       }
+
+       if (MS_Host_ConfigurePipes(&DiskHost_MS_Interface,
+                                                          ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)

        {
        {

-               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 (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)
 }
 
 void EVENT_USB_Host_DeviceAttached(void)


@@ -125,3 +121,4 @@ void EVENT_USB_Host_DeviceUnattached(void)
 }
 
 #endif
 }
 
 #endif

+