X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/e331b531c6e6d93eb0eee42b9002074e8090ad18..071e02c6b6b4837fa9cf0b6d4c749994e02638d7:/LUFA/Drivers/USB/LowLevel/USBInterrupt.c?ds=inline

diff --git a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
index 2d9e35b72..7edd3ce6a 100644
--- a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
@@ -1,247 +1,247 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
-  dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
-*/
-
-/*
-  Copyright 2010  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
-  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 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "USBInterrupt.h"
-
-void USB_INT_DisableAllInterrupts(void)
-{
-	#if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	USBCON &= ~((1 << VBUSTE) | (1 << IDTE));				
-	#elif defined(USB_SERIES_4_AVR)
-	USBCON &= ~(1 << VBUSTE);
-	#endif
-	
-	#if defined(USB_CAN_BE_HOST)
-	UHIEN   = 0;
-	OTGIEN  = 0;
-	#endif
-	
-	#if defined(USB_CAN_BE_DEVICE)
-	UDIEN   = 0;
-	#endif
-}
-
-void USB_INT_ClearAllInterrupts(void)
-{
-	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	USBINT  = 0;
-	#endif
-	
-	#if defined(USB_CAN_BE_HOST)
-	UHINT   = 0;
-	OTGINT  = 0;
-	#endif
-	
-	#if defined(USB_CAN_BE_DEVICE)
-	UDINT   = 0;
-	#endif
-}
-
-ISR(USB_GEN_vect, ISR_BLOCK)
-{
-	#if defined(USB_CAN_BE_DEVICE)
-	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))
-	{
-		USB_INT_Clear(USB_INT_VBUS);
-
-		if (USB_VBUS_GetStatus())
-		{
-			USB_DeviceState = DEVICE_STATE_Powered;
-			EVENT_USB_Device_Connect();
-		}
-		else
-		{
-			USB_DeviceState = DEVICE_STATE_Unattached;		
-			EVENT_USB_Device_Disconnect();
-		}
-	}
-	#endif
-
-	if (USB_INT_HasOccurred(USB_INT_SUSPEND) && USB_INT_IsEnabled(USB_INT_SUSPEND))
-	{
-		USB_INT_Clear(USB_INT_SUSPEND);
-
-		USB_INT_Disable(USB_INT_SUSPEND);
-		USB_INT_Enable(USB_INT_WAKEUP);
-		
-		USB_CLK_Freeze();
-		
-		if (!(USB_Options & USB_OPT_MANUAL_PLL))
-		  USB_PLL_Off();
-
-		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
-		USB_DeviceState = DEVICE_STATE_Unattached;
-		EVENT_USB_Device_Disconnect();
-		#else
-		USB_DeviceState = DEVICE_STATE_Suspended;
-		EVENT_USB_Device_Suspend();
-		#endif
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_WAKEUP) && USB_INT_IsEnabled(USB_INT_WAKEUP))
-	{
-		if (!(USB_Options & USB_OPT_MANUAL_PLL))
-		{
-			USB_PLL_On();
-			while (!(USB_PLL_IsReady()));
-		}
-
-		USB_CLK_Unfreeze();
-
-		USB_INT_Clear(USB_INT_WAKEUP);
-
-		USB_INT_Disable(USB_INT_WAKEUP);
-		USB_INT_Enable(USB_INT_SUSPEND);
-		
-		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
-		USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
-		EVENT_USB_Device_Connect();
-		#else
-		USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
-		EVENT_USB_Device_WakeUp();		
-		#endif
-	}
-   
-	if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI))
-	{
-		USB_INT_Clear(USB_INT_EORSTI);
-
-		USB_DeviceState         = DEVICE_STATE_Default;
-		USB_ConfigurationNumber = 0;
-
-		USB_INT_Clear(USB_INT_SUSPEND);
-		USB_INT_Disable(USB_INT_SUSPEND);
-		USB_INT_Enable(USB_INT_WAKEUP);
-
-		Endpoint_ClearEndpoints();
-
-		Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
-		                           ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
-		                           ENDPOINT_BANK_SINGLE);
-
-		#if defined(INTERRUPT_CONTROL_ENDPOINT)
-		USB_INT_Enable(USB_INT_RXSTPI);
-		#endif
-
-		EVENT_USB_Device_Reset();
-	}
-	
-	if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
-	{
-		USB_INT_Clear(USB_INT_SOFI);
-		
-		EVENT_USB_Device_StartOfFrame();
-	}
-	#endif
-	
-	#if defined(USB_CAN_BE_HOST)
-	if (USB_INT_HasOccurred(USB_INT_DDISCI) && USB_INT_IsEnabled(USB_INT_DDISCI))
-	{
-		USB_INT_Clear(USB_INT_DDISCI);
-		USB_INT_Clear(USB_INT_DCONNI);
-		USB_INT_Disable(USB_INT_DDISCI);
-			
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-	
-	if (USB_INT_HasOccurred(USB_INT_VBERRI) && USB_INT_IsEnabled(USB_INT_VBERRI))
-	{
-		USB_INT_Clear(USB_INT_VBERRI);
-
-		USB_Host_VBUS_Manual_Off();
-		USB_Host_VBUS_Auto_Off();
-
-		EVENT_USB_Host_HostError(HOST_ERROR_VBusVoltageDip);
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_HostState = HOST_STATE_Unattached;
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_SRPI) && USB_INT_IsEnabled(USB_INT_SRPI))
-	{
-		USB_INT_Clear(USB_INT_SRPI);
-		USB_INT_Disable(USB_INT_SRPI);
-	
-		EVENT_USB_Host_DeviceAttached();
-
-		USB_INT_Enable(USB_INT_DDISCI);
-		
-		USB_HostState = HOST_STATE_Powered;
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_BCERRI) && USB_INT_IsEnabled(USB_INT_BCERRI))
-	{
-		USB_INT_Clear(USB_INT_BCERRI);
-		
-		EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-	#endif
-
-	#if defined(USB_CAN_BE_BOTH)
-	if (USB_INT_HasOccurred(USB_INT_IDTI) && USB_INT_IsEnabled(USB_INT_IDTI))
-	{		
-		USB_INT_Clear(USB_INT_IDTI);
-
-		if (USB_DeviceState != DEVICE_STATE_Unattached)
-		  EVENT_USB_Device_Disconnect();
-
-		if (USB_HostState != HOST_STATE_Unattached)
-		  EVENT_USB_Host_DeviceUnattached();
-		
-		USB_CurrentMode = USB_GetUSBModeFromUID();
-		EVENT_USB_UIDChange();
-
-		USB_ResetInterface();
-	}
-	#endif
-}
-
-#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)
-ISR(USB_COM_vect, ISR_BLOCK)
-{
-	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
-
-	USB_INT_Disable(USB_INT_RXSTPI);
-	sei();
-	USB_USBTask();
-	USB_INT_Enable(USB_INT_RXSTPI);
-
-	USB_INT_Clear(USB_INT_RXSTPI);
-	
-	Endpoint_SelectEndpoint(PrevSelectedEndpoint);
-}
-#endif
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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
+  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 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#define  __INCLUDE_FROM_USB_DRIVER
+#include "USBInterrupt.h"
+
+void USB_INT_DisableAllInterrupts(void)
+{
+	#if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
+	USBCON &= ~((1 << VBUSTE) | (1 << IDTE));				
+	#elif defined(USB_SERIES_4_AVR)
+	USBCON &= ~(1 << VBUSTE);
+	#endif
+	
+	#if defined(USB_CAN_BE_HOST)
+	UHIEN   = 0;
+	OTGIEN  = 0;
+	#endif
+	
+	#if defined(USB_CAN_BE_DEVICE)
+	UDIEN   = 0;
+	#endif
+}
+
+void USB_INT_ClearAllInterrupts(void)
+{
+	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
+	USBINT  = 0;
+	#endif
+	
+	#if defined(USB_CAN_BE_HOST)
+	UHINT   = 0;
+	OTGINT  = 0;
+	#endif
+	
+	#if defined(USB_CAN_BE_DEVICE)
+	UDINT   = 0;
+	#endif
+}
+
+ISR(USB_GEN_vect, ISR_BLOCK)
+{
+	#if defined(USB_CAN_BE_DEVICE)
+	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
+	if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))
+	{
+		USB_INT_Clear(USB_INT_VBUS);
+
+		if (USB_VBUS_GetStatus())
+		{
+			USB_DeviceState = DEVICE_STATE_Powered;
+			EVENT_USB_Device_Connect();
+		}
+		else
+		{
+			USB_DeviceState = DEVICE_STATE_Unattached;		
+			EVENT_USB_Device_Disconnect();
+		}
+	}
+	#endif
+
+	if (USB_INT_HasOccurred(USB_INT_SUSPEND) && USB_INT_IsEnabled(USB_INT_SUSPEND))
+	{
+		USB_INT_Clear(USB_INT_SUSPEND);
+
+		USB_INT_Disable(USB_INT_SUSPEND);
+		USB_INT_Enable(USB_INT_WAKEUP);
+		
+		USB_CLK_Freeze();
+		
+		if (!(USB_Options & USB_OPT_MANUAL_PLL))
+		  USB_PLL_Off();
+
+		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
+		USB_DeviceState = DEVICE_STATE_Unattached;
+		EVENT_USB_Device_Disconnect();
+		#else
+		USB_DeviceState = DEVICE_STATE_Suspended;
+		EVENT_USB_Device_Suspend();
+		#endif
+	}
+
+	if (USB_INT_HasOccurred(USB_INT_WAKEUP) && USB_INT_IsEnabled(USB_INT_WAKEUP))
+	{
+		if (!(USB_Options & USB_OPT_MANUAL_PLL))
+		{
+			USB_PLL_On();
+			while (!(USB_PLL_IsReady()));
+		}
+
+		USB_CLK_Unfreeze();
+
+		USB_INT_Clear(USB_INT_WAKEUP);
+
+		USB_INT_Disable(USB_INT_WAKEUP);
+		USB_INT_Enable(USB_INT_SUSPEND);
+		
+		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
+		USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
+		EVENT_USB_Device_Connect();
+		#else
+		USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
+		EVENT_USB_Device_WakeUp();		
+		#endif
+	}
+   
+	if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI))
+	{
+		USB_INT_Clear(USB_INT_EORSTI);
+
+		USB_DeviceState         = DEVICE_STATE_Default;
+		USB_ConfigurationNumber = 0;
+
+		USB_INT_Clear(USB_INT_SUSPEND);
+		USB_INT_Disable(USB_INT_SUSPEND);
+		USB_INT_Enable(USB_INT_WAKEUP);
+
+		Endpoint_ClearEndpoints();
+
+		Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
+		                           ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
+		                           ENDPOINT_BANK_SINGLE);
+
+		#if defined(INTERRUPT_CONTROL_ENDPOINT)
+		USB_INT_Enable(USB_INT_RXSTPI);
+		#endif
+
+		EVENT_USB_Device_Reset();
+	}
+	
+	if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
+	{
+		USB_INT_Clear(USB_INT_SOFI);
+		
+		EVENT_USB_Device_StartOfFrame();
+	}
+	#endif
+	
+	#if defined(USB_CAN_BE_HOST)
+	if (USB_INT_HasOccurred(USB_INT_DDISCI) && USB_INT_IsEnabled(USB_INT_DDISCI))
+	{
+		USB_INT_Clear(USB_INT_DDISCI);
+		USB_INT_Clear(USB_INT_DCONNI);
+		USB_INT_Disable(USB_INT_DDISCI);
+			
+		EVENT_USB_Host_DeviceUnattached();
+
+		USB_ResetInterface();
+	}
+	
+	if (USB_INT_HasOccurred(USB_INT_VBERRI) && USB_INT_IsEnabled(USB_INT_VBERRI))
+	{
+		USB_INT_Clear(USB_INT_VBERRI);
+
+		USB_Host_VBUS_Manual_Off();
+		USB_Host_VBUS_Auto_Off();
+
+		EVENT_USB_Host_HostError(HOST_ERROR_VBusVoltageDip);
+		EVENT_USB_Host_DeviceUnattached();
+
+		USB_HostState = HOST_STATE_Unattached;
+	}
+
+	if (USB_INT_HasOccurred(USB_INT_SRPI) && USB_INT_IsEnabled(USB_INT_SRPI))
+	{
+		USB_INT_Clear(USB_INT_SRPI);
+		USB_INT_Disable(USB_INT_SRPI);
+	
+		EVENT_USB_Host_DeviceAttached();
+
+		USB_INT_Enable(USB_INT_DDISCI);
+		
+		USB_HostState = HOST_STATE_Powered;
+	}
+
+	if (USB_INT_HasOccurred(USB_INT_BCERRI) && USB_INT_IsEnabled(USB_INT_BCERRI))
+	{
+		USB_INT_Clear(USB_INT_BCERRI);
+		
+		EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);
+		EVENT_USB_Host_DeviceUnattached();
+
+		USB_ResetInterface();
+	}
+	#endif
+
+	#if defined(USB_CAN_BE_BOTH)
+	if (USB_INT_HasOccurred(USB_INT_IDTI) && USB_INT_IsEnabled(USB_INT_IDTI))
+	{		
+		USB_INT_Clear(USB_INT_IDTI);
+
+		if (USB_DeviceState != DEVICE_STATE_Unattached)
+		  EVENT_USB_Device_Disconnect();
+
+		if (USB_HostState != HOST_STATE_Unattached)
+		  EVENT_USB_Host_DeviceUnattached();
+		
+		USB_CurrentMode = USB_GetUSBModeFromUID();
+		EVENT_USB_UIDChange();
+
+		USB_ResetInterface();
+	}
+	#endif
+}
+
+#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)
+ISR(USB_COM_vect, ISR_BLOCK)
+{
+	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
+
+	USB_INT_Disable(USB_INT_RXSTPI);
+	sei();
+	USB_USBTask();
+	USB_INT_Enable(USB_INT_RXSTPI);
+
+	USB_INT_Clear(USB_INT_RXSTPI);
+	
+	Endpoint_SelectEndpoint(PrevSelectedEndpoint);
+}
+#endif