Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / USBController.h

diff --git a/LUFA/Drivers/USB/Core/USBController.h b/LUFA/Drivers/USB/Core/USBController.h
index 80beb70..7702b74 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBController.h
+++ b/LUFA/Drivers/USB/Core/USBController.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -131,6 +131,20 @@
                #define EP_TYPE_INTERRUPT                  0x03
                //@}
 
                #define EP_TYPE_INTERRUPT                  0x03
                //@}
 

+       /* Enums: */
+               /** Enum for the possible USB controller modes, for initialization via \ref USB_Init() and indication back to the
+                *  user application via \ref USB_CurrentMode.
+                */
+               enum USB_Modes_t
+               {
+                       USB_MODE_None   = 0, /**< Indicates that the controller is currently not initialized in any specific USB mode. */
+                       USB_MODE_Device = 1, /**< Indicates that the controller is currently initialized in USB Device mode. */
+                       USB_MODE_Host   = 2, /**< Indicates that the controller is currently initialized in USB Host mode. */
+                       USB_MODE_UID    = 3, /**< Indicates that the controller should determine the USB mode from the UID pin of the
+                                             *   USB connector.
+                                             */
+               };
+

        /* Architecture Includes: */
                #if (ARCH == ARCH_AVR8)
                        #include "AVR8/USBController_AVR8.h"
        /* Architecture Includes: */
                #if (ARCH == ARCH_AVR8)
                        #include "AVR8/USBController_AVR8.h"