Oops - revert changes to the Device mode Class Driver VirtualSerial demo makefile.

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

diff --git a/LUFA/Drivers/USB/LowLevel/USBController.h b/LUFA/Drivers/USB/LowLevel/USBController.h
index f26f773..298141e 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/USBController.h
+++ b/LUFA/Drivers/USB/LowLevel/USBController.h
@@ -64,15 +64,17 @@
                
                #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
                        #include "Host.h"
                
                #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
                        #include "Host.h"

-                       #include "Pipe.h"

                        #include "OTG.h"
                        #include "OTG.h"

+                       #include "Pipe.h"

                        #include "../HighLevel/HostStandardReq.h"
                        #include "../HighLevel/HostStandardReq.h"

+                       #include "../HighLevel/PipeStream.h"

                #endif
                
                #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
                        #include "Device.h"
                        #include "Endpoint.h"
                        #include "../HighLevel/DeviceStandardReq.h"
                #endif
                
                #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
                        #include "Device.h"
                        #include "Endpoint.h"
                        #include "../HighLevel/DeviceStandardReq.h"

+                       #include "../HighLevel/EndpointStream.h"

                #endif
 
        /* Enable C linkage for C++ Compilers: */
                #endif
 
        /* Enable C linkage for C++ Compilers: */


@@ -264,7 +266,7 @@
                         *                      Valid mode masks are \ref USB_MODE_DEVICE, \ref USB_MODE_HOST or \ref USB_MODE_UID.
                         *
                         *  \param[in] Options  Mask indicating the options which should be used when initializing the USB
                         *                      Valid mode masks are \ref USB_MODE_DEVICE, \ref USB_MODE_HOST or \ref USB_MODE_UID.
                         *
                         *  \param[in] Options  Mask indicating the options which should be used when initializing the USB

-                        *                      interface to control the USB interface's behavior. This should be comprised of
+                        *                      interface to control the USB interface's behaviour. This should be comprised of

                         *                      a USB_OPT_REG_* mask to control the regulator, a USB_OPT_*_PLL mask to control the
                         *                      PLL, and a USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
                         *                      mode speed.
                         *                      a USB_OPT_REG_* mask to control the regulator, a USB_OPT_*_PLL mask to control the
                         *                      PLL, and a USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
                         *                      mode speed.


@@ -315,17 +317,6 @@
                         */
                        void USB_ResetInterface(void);
 
                         */
                        void USB_ResetInterface(void);
 

-               /* Enums: */
-                       /** Enum for error codes relating to the powering on of the USB interface. These error codes are
-                        *  used in the ErrorCode parameter value of the \ref EVENT_USB_InitFailure() event.
-                        */
-                       enum USB_InitErrorCodes_t
-                       {
-                               USB_INITERROR_NoUSBModeSpecified       = 0, /**< Indicates that \ref USB_Init() was called with an
-                                                                            *   invalid or missing Mode parameter.
-                                                                            */
-                       };
-

                /* Global Variables: */
                        #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) || defined(__DOXYGEN__)
                                /** Indicates the mode that the USB interface is currently initialized to. This value will be
                /* Global Variables: */
                        #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) || defined(__DOXYGEN__)
                                /** Indicates the mode that the USB interface is currently initialized to. This value will be


@@ -355,6 +346,17 @@
 
        /* Private Interface - For use in library only: */
        #if !defined(__DOXYGEN__)
 
        /* Private Interface - For use in library only: */
        #if !defined(__DOXYGEN__)

+               /* Function Prototypes: */
+                       #if defined(__INCLUDE_FROM_USB_CONTROLLER_C)
+                               #if defined(USB_CAN_BE_DEVICE)
+                               static void USB_Init_Device(void);
+                               #endif
+                               
+                               #if defined(USB_CAN_BE_HOST)
+                               static void USB_Init_Host(void);
+                               #endif
+                       #endif
+       

                /* Inline Functions: */
                        static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE;
                        static inline void USB_PLL_On(void)
                /* Inline Functions: */
                        static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE;
                        static inline void USB_PLL_On(void)


@@ -452,7 +454,7 @@
                                  return USB_MODE_HOST;
                        }
                        #endif
                                  return USB_MODE_HOST;
                        }
                        #endif

-                       
+

        #endif
        
        /* Disable C linkage for C++ Compilers: */
        #endif
        
        /* Disable C linkage for C++ Compilers: */