Move new Class Driver powered demos to a new ClassDriver subdirectory, re-add old...

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

diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h
index b1d60af..911b41b 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.h
+++ b/LUFA/Drivers/USB/LowLevel/Host.h
@@ -60,7 +60,7 @@
                         *  and that the address used is not important (other than the fact that it is non-zero), a\r
                         *  fixed value is specified by the library.\r
                         */\r
                         *  and that the address used is not important (other than the fact that it is non-zero), a\r
                         *  fixed value is specified by the library.\r
                         */\r

-                       #define USB_HOST_DEVICEADDRESS             1\r
+                       #define USB_HOST_DEVICEADDRESS                 1\r

 \r
                        #if !defined(USB_HOST_TIMEOUT_MS) || defined(__DOXYGEN__)\r
                                /** Constant for the maximum software timeout period of sent USB control transactions to an attached\r
 \r
                        #if !defined(USB_HOST_TIMEOUT_MS) || defined(__DOXYGEN__)\r
                                /** Constant for the maximum software timeout period of sent USB control transactions to an attached\r


@@ -199,7 +199,7 @@
                                HOST_STATE_Suspended                    = 13, /**< May be implemented by the user project. */\r
                        };\r
                        \r
                                HOST_STATE_Suspended                    = 13, /**< May be implemented by the user project. */\r
                        };\r
                        \r

-                       /** Enum for the error codes for the \ref USB_HostError event.\r
+                       /** Enum for the error codes for the \ref EVENT_USB_HostError() event.\r

                         *\r
                         *  \see \ref Group_Events for more information on this event.\r
                         */\r
                         *\r
                         *  \see \ref Group_Events for more information on this event.\r
                         */\r


@@ -213,14 +213,14 @@
                                                                      */\r
                        };\r
                        \r
                                                                      */\r
                        };\r
                        \r

-                       /** Enum for the error codes for the \ref USB_DeviceEnumerationFailed event.\r
+                       /** Enum for the error codes for the \ref EVENT_USB_DeviceEnumerationFailed() event.\r

                         *\r
                         *  \see \ref Group_Events for more information on this event.\r
                         */\r
                        enum USB_Host_EnumerationErrorCodes_t\r
                        {\r
                                HOST_ENUMERROR_NoError          = 0, /**< No error occurred. Used internally, this is not a valid\r
                         *\r
                         *  \see \ref Group_Events for more information on this event.\r
                         */\r
                        enum USB_Host_EnumerationErrorCodes_t\r
                        {\r
                                HOST_ENUMERROR_NoError          = 0, /**< No error occurred. Used internally, this is not a valid\r

-                                                                     *   ErrorCode parameter value for the \ref USB_DeviceEnumerationFailed\r
+                                                                     *   ErrorCode parameter value for the \ref EVENT_USB_DeviceEnumerationFailed()\r

                                                                      *   event.\r
                                                                      */\r
                                HOST_ENUMERROR_WaitStage        = 1, /**< One of the delays between enumeration steps failed\r
                                                                      *   event.\r
                                                                      */\r
                                HOST_ENUMERROR_WaitStage        = 1, /**< One of the delays between enumeration steps failed\r


@@ -244,7 +244,7 @@
                        #define USB_Host_HostMode_On()          MACROS{ USBCON |=  (1 << HOST);           }MACROE\r
                        #define USB_Host_HostMode_Off()         MACROS{ USBCON &= ~(1 << HOST);           }MACROE\r
 \r
                        #define USB_Host_HostMode_On()          MACROS{ USBCON |=  (1 << HOST);           }MACROE\r
                        #define USB_Host_HostMode_Off()         MACROS{ USBCON &= ~(1 << HOST);           }MACROE\r
 \r

-                       #define USB_Host_VBUS_Auto_Enable()     MACROS{ OTGCON &= ~(1 << VBUSHWC); UHWCON |=  (1 << UVCONE);                    }MACROE\r
+                       #define USB_Host_VBUS_Auto_Enable()     MACROS{ OTGCON &= ~(1 << VBUSHWC); UHWCON |=  (1 << UVCONE);                   }MACROE\r

                        #define USB_Host_VBUS_Manual_Enable()   MACROS{ OTGCON |=  (1 << VBUSHWC); UHWCON &= ~(1 << UVCONE); DDRE |= (1 << 7); }MACROE\r
 \r
                        #define USB_Host_VBUS_Auto_On()         MACROS{ OTGCON |= (1 << VBUSREQ);         }MACROE\r
                        #define USB_Host_VBUS_Manual_Enable()   MACROS{ OTGCON |=  (1 << VBUSHWC); UHWCON &= ~(1 << UVCONE); DDRE |= (1 << 7); }MACROE\r
 \r
                        #define USB_Host_VBUS_Auto_On()         MACROS{ OTGCON |= (1 << VBUSREQ);         }MACROE\r


@@ -265,8 +265,12 @@
                        };\r
 \r
                /* Function Prototypes: */\r
                        };\r
 \r
                /* Function Prototypes: */\r

+                       void    USB_Host_ProcessNextHostState(void);\r

                        uint8_t USB_Host_WaitMS(uint8_t MS);\r
                        uint8_t USB_Host_WaitMS(uint8_t MS);\r

-                       void    USB_Host_ResetDevice(void);\r
+                       \r
+                       #if defined(INCLUDE_FROM_HOST_C)\r
+                               static void USB_Host_ResetDevice(void);\r
+                       #endif\r

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