X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3693916cd38bd919f07fe45a2f9d19f5f689242f..6e7fc21a94f29e09b4bdce7c17cade5b1322bc7d:/Projects/Webserver/USBHostMode.c?ds=inline

diff --git a/Projects/Webserver/USBHostMode.c b/Projects/Webserver/USBHostMode.c
index d3caa4078..1fcec3491 100644
--- a/Projects/Webserver/USBHostMode.c
+++ b/Projects/Webserver/USBHostMode.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
-  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
-  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
@@ -33,14 +33,14 @@
  *  USB Host Mode management functions and variables. This file contains the LUFA code required to
  *  manage the USB RNDIS host mode.
  */
- 
+
 #include "USBHostMode.h"
 
 /** LUFA RNDIS Class driver interface configuration and state information. This structure is
  *  passed to all RNDIS Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.
  */
-USB_ClassInfo_RNDIS_Host_t Ethernet_RNDIS_Interface =
+USB_ClassInfo_RNDIS_Host_t Ethernet_RNDIS_Interface_Host =
 	{
 		.Config =
 			{
@@ -52,7 +52,7 @@ USB_ClassInfo_RNDIS_Host_t Ethernet_RNDIS_Interface =
 
 				.NotificationPipeNumber     = 3,
 				.NotificationPipeDoubleBank = false,
-				
+
 				.HostMaxPacketSize          = UIP_CONF_BUFFER_SIZE,
 			},
 	};
@@ -70,7 +70,7 @@ void USBHostMode_USBTask(void)
 	{
 		case HOST_STATE_Addressed:
 			LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
-		
+
 			uint16_t ConfigDescriptorSize;
 			uint8_t  ConfigDescriptorData[512];
 
@@ -82,58 +82,58 @@ void USBHostMode_USBTask(void)
 				break;
 			}
 
-			if (RNDIS_Host_ConfigurePipes(&Ethernet_RNDIS_Interface,
+			if (RNDIS_Host_ConfigurePipes(&Ethernet_RNDIS_Interface_Host,
 										  ConfigDescriptorSize, ConfigDescriptorData) != RNDIS_ENUMERROR_NoError)
 			{
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
-			
+
 			if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
 			{
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
-			
-			if (RNDIS_Host_InitializeDevice(&Ethernet_RNDIS_Interface) != HOST_SENDCONTROL_Successful)
+
+			if (RNDIS_Host_InitializeDevice(&Ethernet_RNDIS_Interface_Host) != HOST_SENDCONTROL_Successful)
 			{
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;			
+				break;
 			}
-			
+
 			uint32_t PacketFilter = (REMOTE_NDIS_PACKET_DIRECTED | REMOTE_NDIS_PACKET_BROADCAST);
-			if (RNDIS_Host_SetRNDISProperty(&Ethernet_RNDIS_Interface, OID_GEN_CURRENT_PACKET_FILTER,
+			if (RNDIS_Host_SetRNDISProperty(&Ethernet_RNDIS_Interface_Host, OID_GEN_CURRENT_PACKET_FILTER,
 											&PacketFilter, sizeof(PacketFilter)) != HOST_SENDCONTROL_Successful)
 			{
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
-			
-			if (RNDIS_Host_QueryRNDISProperty(&Ethernet_RNDIS_Interface, OID_802_3_CURRENT_ADDRESS,
+
+			if (RNDIS_Host_QueryRNDISProperty(&Ethernet_RNDIS_Interface_Host, OID_802_3_CURRENT_ADDRESS,
 											  &MACAddress, sizeof(MACAddress)) != HOST_SENDCONTROL_Successful)
 			{
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
-			
+
 			/* Initialize uIP stack */
 			uIPManagement_Init();
-			
+
 			LEDs_SetAllLEDs(LEDMASK_USB_READY);
 			USB_HostState = HOST_STATE_Configured;
 			break;
 		case HOST_STATE_Configured:
 			uIPManagement_ManageNetwork();
-		
+
 			break;
 	}
 
-	RNDIS_Host_USBTask(&Ethernet_RNDIS_Interface);
+	RNDIS_Host_USBTask(&Ethernet_RNDIS_Interface_Host);
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@@ -163,7 +163,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
-	USB_ShutDown();
+	USB_Disable();
 
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	for(;;);
@@ -176,3 +176,4 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
+