AppConfigHeaders: Merge in latest trunk.

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

diff --git a/LUFA/Drivers/USB/Core/Host.h b/LUFA/Drivers/USB/Core/Host.h
index a7e647d..dd9983d 100644 (file)
--- a/LUFA/Drivers/USB/Core/Host.h
+++ b/LUFA/Drivers/USB/Core/Host.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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


@@ -51,7 +51,7 @@
 
        /* Includes: */
                #include "../../../Common/Common.h"
 
        /* Includes: */
                #include "../../../Common/Common.h"

-               #include "USBMode.h"            
+               #include "USBMode.h"

 
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
 
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)


@@ -108,16 +108,16 @@
                                                                               *   bus address is being set.
                                                                               */
                                HOST_STATE_Default_PostAddressSet       = 9,  /**< This state indicates that the device's address has now been set, and the
                                                                               *   bus address is being set.
                                                                               */
                                HOST_STATE_Default_PostAddressSet       = 9,  /**< This state indicates that the device's address has now been set, and the

-                                                                              *   stack is has now completed the device enumeration process. This state causes 
+                                                                              *   stack is has now completed the device enumeration process. This state causes

                                                                               *   the stack to change the current USB device address to that set for the
                                                                               *   connected device, before progressing to the \ref HOST_STATE_Addressed state
                                                                               *   ready for use in the user application.
                                                                               */
                                HOST_STATE_Addressed                    = 10, /**< Indicates that the device has been enumerated and addressed, and is now waiting
                                                                               *   the stack to change the current USB device address to that set for the
                                                                               *   connected device, before progressing to the \ref HOST_STATE_Addressed state
                                                                               *   ready for use in the user application.
                                                                               */
                                HOST_STATE_Addressed                    = 10, /**< Indicates that the device has been enumerated and addressed, and is now waiting

-                                                                              *   for the user application to configure the device ready for use.                              
+                                                                              *   for the user application to configure the device ready for use.

                                                                               */
                                HOST_STATE_Configured                   = 11, /**< Indicates that the device has been configured into a valid device configuration,
                                                                               */
                                HOST_STATE_Configured                   = 11, /**< Indicates that the device has been configured into a valid device configuration,

-                                                                              *   ready for general use by the user application.                               
+                                                                              *   ready for general use by the user application.

                                                                               */
                        };
 
                                                                               */
                        };