Added new NO_DEVICE_SELF_POWER and NO_DEVICE_REMOTE_WAKEUP compile time options.

diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index b0b1ba5..e97b9d4 100644 (file)
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -81,7 +81,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .ConfigurationNumber    = 1,\r
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r
                        .ConfigurationNumber    = 1,\r
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r

-                       .ConfigAttributes       = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),\r
+                       .ConfigAttributes       = USB_CONFIG_ATTR_BUSPOWERED,\r

                        \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                        \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 806ada2..8d91b76 100644 (file)
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -127,6 +127,8 @@ LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r

+LUFA_OPTS += -D NO_DEVICE_SELF_POWER\r
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r

diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c
index eb5c580..2fed768 100644 (file)
--- a/Bootloaders/DFU/Descriptors.c
+++ b/Bootloaders/DFU/Descriptors.c
@@ -81,7 +81,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .ConfigurationNumber      = 1,\r
                        .ConfigurationStrIndex    = NO_DESCRIPTOR,\r
                                \r
                        .ConfigurationNumber      = 1,\r
                        .ConfigurationStrIndex    = NO_DESCRIPTOR,\r
                                \r

-                       .ConfigAttributes         = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),\r
+                       .ConfigAttributes         = USB_CONFIG_ATTR_BUSPOWERED,\r

                        \r
                        .MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)\r
                },\r
                        \r
                        .MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)\r
                },\r

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 8b16c35..cd5d2c7 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -128,6 +128,8 @@ LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r

+LUFA_OPTS += -D NO_DEVICE_SELF_POWER\r
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index b85bd7a..14f0500 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -101,7 +101,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .ConfigurationNumber    = 1,\r
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r
                        .ConfigurationNumber    = 1,\r
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r

-                       .ConfigAttributes       = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),\r
+                       .ConfigAttributes       = USB_CONFIG_ATTR_BUSPOWERED,\r

                        \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                        \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 99e3b48..8de8f8f 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -127,6 +127,8 @@ LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r

+LUFA_OPTS += -D NO_DEVICE_SELF_POWER\r
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r

diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
index 9b46c09..1bbe6c6 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@ -119,6 +119,7 @@
                         */\r
                        #define USB_CONFIG_ATTR_BUSPOWERED        0x80\r
 \r
                         */\r
                        #define USB_CONFIG_ATTR_BUSPOWERED        0x80\r
 \r

+                       \r

                        /** Can be masked with other configuration descriptor attributes for a \ref USB_Descriptor_Configuration_Header_t\r
                         *  descriptor's ConfigAttributes value to indicate that the specified configuration can draw its power\r
                         *  from the device's own power source.\r
                        /** Can be masked with other configuration descriptor attributes for a \ref USB_Descriptor_Configuration_Header_t\r
                         *  descriptor's ConfigAttributes value to indicate that the specified configuration can draw its power\r
                         *  from the device's own power source.\r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 6e7b2c7..3f0976b 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -36,8 +36,14 @@
 #include "DevChapter9.h"\r
 \r
 uint8_t USB_ConfigurationNumber;\r
 #include "DevChapter9.h"\r
 \r
 uint8_t USB_ConfigurationNumber;\r

-bool    USB_RemoteWakeupEnabled;\r
+\r
+#if !defined(NO_DEVICE_SELF_POWER)\r

 bool    USB_CurrentlySelfPowered;\r
 bool    USB_CurrentlySelfPowered;\r

+#endif\r
+\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+bool    USB_RemoteWakeupEnabled;\r
+#endif\r

 \r
 void USB_Device_ProcessControlRequest(void)\r
 {\r
 \r
 void USB_Device_ProcessControlRequest(void)\r
 {\r


@@ -302,12 +308,16 @@ static void USB_Device_GetStatus(void)
        switch (USB_ControlRequest.bmRequestType)\r
        {\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r
        switch (USB_ControlRequest.bmRequestType)\r
        {\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r

+#if !defined(NO_DEVICE_SELF_POWER)\r

                        if (USB_CurrentlySelfPowered)\r
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;\r
                        if (USB_CurrentlySelfPowered)\r
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;\r

-                       \r
+#endif\r
+\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \r

                        if (USB_RemoteWakeupEnabled)\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r
                        if (USB_RemoteWakeupEnabled)\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r

-                       \r
+#endif\r
+\r

                        break;\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r
                        break;\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r


@@ -336,10 +346,12 @@ static void USB_Device_ClearSetFeature(void)
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r
                case REQREC_DEVICE:\r
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r
                case REQREC_DEVICE:\r

+#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \r

                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r
                        else\r
                          return;\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r
                        else\r
                          return;\r

+#endif\r

                        \r
                        break;                  \r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                        \r
                        break;                  \r
 #if !defined(CONTROL_ONLY_DEVICE)\r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index e6baca2..8b64982 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -82,23 +82,32 @@
                         */\r
                        extern uint8_t USB_ConfigurationNumber;\r
                        \r
                         */\r
                        extern uint8_t USB_ConfigurationNumber;\r
                        \r

-                       /** Indicates if the host is currently allowing the device to issue remote wakeup events. If this\r
-                        *  flag is cleared, the device should not issue remote wakeup events to the host.\r
-                        *\r
-                        *  \note This variable should be treated as read-only in the user application, and never manually\r
-                        *        changed in value.\r
-                        *\r
-                        *  \ingroup Group_Device\r
-                        */\r
-                       extern bool USB_RemoteWakeupEnabled;\r
+                       #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+                               /** Indicates if the host is currently allowing the device to issue remote wakeup events. If this\r
+                                *  flag is cleared, the device should not issue remote wakeup events to the host.\r
+                                *\r
+                                *  \note This variable should be treated as read-only in the user application, and never manually\r
+                                *        changed in value.\r
+                                *\r
+                                *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,\r
+                                *        this global and the underlying management code can be disabled by defining the \r
+                                *        NO_DEVICE_REMOTE_WAKEUP token in the project makefile and passing it to the compiler via\r
+                                *        the -D switch.\r
+                                *\r
+                                *  \ingroup Group_Device\r
+                                */\r
+                               extern bool USB_RemoteWakeupEnabled;\r
+                       #endif\r

                        \r
                        \r

-                       /** Indicates if the device is currently being powered by its own power supply, rather than being\r
-                        *  powered by the host's USB supply. This flag should remain cleared if the device does not\r
-                        *  support self powered mode, as indicated in the device descriptors.\r
-                        *\r
-                        *  \ingroup Group_Device\r
-                        */\r
-                       extern bool USB_CurrentlySelfPowered;\r
+                       #if !defined(NO_DEVICE_SELF_POWER)\r
+                               /** Indicates if the device is currently being powered by its own power supply, rather than being\r
+                                *  powered by the host's USB supply. This flag should remain cleared if the device does not\r
+                                *  support self powered mode, as indicated in the device descriptors.\r
+                                *\r
+                                *  \ingroup Group_Device\r
+                                */\r
+                               extern bool USB_CurrentlySelfPowered;\r
+                       #endif\r

        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index acffd80..74736a7 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -83,7 +83,8 @@
                                 *  \note This macro should only be used if the device has indicated to the host that it\r
                                 *        supports the Remote Wakeup feature in the device descriptors, and should only be\r
                                 *        issued if the host is currently allowing remote wakeup events from the device (i.e.,\r
                                 *  \note This macro should only be used if the device has indicated to the host that it\r
                                 *        supports the Remote Wakeup feature in the device descriptors, and should only be\r
                                 *        issued if the host is currently allowing remote wakeup events from the device (i.e.,\r

-                                *        the \ref USB_RemoteWakeupEnabled flag is set).\r
+                                *        the \ref USB_RemoteWakeupEnabled flag is set). When the NO_DEVICE_REMOTE_WAKEUP compile\r
+                                *        time option is used, this macro is unavailable.\r

                                 *\r
                                 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.\r
                                 */\r
                                 *\r
                                 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.\r
                                 */\r


@@ -96,7 +97,8 @@
                                 *  a sent RMWAKEUP request was accepted or rejected by the host.\r
                                 *\r
                                 *  \note This macro should only be used if the device has indicated to the host that it\r
                                 *  a sent RMWAKEUP request was accepted or rejected by the host.\r
                                 *\r
                                 *  \note This macro should only be used if the device has indicated to the host that it\r

-                                *        supports the Remote Wakeup feature in the device descriptors.\r
+                                *        supports the Remote Wakeup feature in the device descriptors. When the NO_DEVICE_REMOTE_WAKEUP\r
+                                *        compile time option is used, this macro is unavailable.\r

                                 *\r
                                 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.\r
                                 *\r
                                 *\r
                                 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.\r
                                 *\r


@@ -123,10 +125,12 @@
                                 */\r
                                static inline bool USB_Device_DisableSOFEvents(void);\r
                        #else\r
                                 */\r
                                static inline bool USB_Device_DisableSOFEvents(void);\r
                        #else\r

-                               #define USB_Device_SendRemoteWakeup()   MACROS{ UDCON |= (1 << RMWKUP); }MACROE\r
-\r
-                               #define USB_Device_IsRemoteWakeupSent()       ((UDCON &  (1 << RMWKUP)) ? false : true)\r
+                               #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+                                       #define USB_Device_SendRemoteWakeup()   MACROS{ UDCON |= (1 << RMWKUP); }MACROE\r

 \r
 \r

+                                       #define USB_Device_IsRemoteWakeupSent()       ((UDCON &  (1 << RMWKUP)) ? false : true)\r
+                               #endif\r
+                               \r

                                #define USB_Device_IsUSBSuspended()           ((UDINT &  (1 << SUSPI)) ? true : false)\r
                                \r
                                #define USB_Device_EnableSOFEvents()    MACROS{ USB_INT_Enable(USB_INT_SOFI); }MACROE\r
                                #define USB_Device_IsUSBSuspended()           ((UDINT &  (1 << SUSPI)) ? true : false)\r
                                \r
                                #define USB_Device_EnableSOFEvents()    MACROS{ USB_INT_Enable(USB_INT_SOFI); }MACROE\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index 5ac4761..eb8ee1e 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -142,8 +142,14 @@ void USB_ResetInterface(void)
        #if defined(USB_CAN_BE_DEVICE)\r
        USB_DeviceState = DEVICE_STATE_Unattached;\r
        USB_ConfigurationNumber  = 0;\r
        #if defined(USB_CAN_BE_DEVICE)\r
        USB_DeviceState = DEVICE_STATE_Unattached;\r
        USB_ConfigurationNumber  = 0;\r

-       USB_RemoteWakeupEnabled  = false;\r
-       USB_CurrentlySelfPowered = false;\r
+\r
+       #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+               USB_RemoteWakeupEnabled  = false;\r
+       #endif\r
+       \r
+       #if !defined(NO_DEVICE_SELF_POWER)\r
+               USB_CurrentlySelfPowered = false;\r
+       #endif\r

        #endif\r
        \r
        if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
        #endif\r
        \r
        if (!(USB_Options & USB_OPT_MANUAL_PLL))\r

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
index 2de7a74..70560cf 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
@@ -21,13 +21,16 @@ uint8_t TEMPLATE_FUNC_NAME (const void* Buffer, uint16_t Length)
                  \r
                if (Endpoint_IsINReady())\r
                {\r
                  \r
                if (Endpoint_IsINReady())\r
                {\r

-                       while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
+                       uint16_t BytesInEndpoint = Endpoint_BytesInEndpoint();\r
+               \r
+                       while (Length && (BytesInEndpoint < USB_ControlEndpointSize))\r

                        {\r
                                TEMPLATE_TRANSFER_BYTE(DataStream);\r
                                Length--;\r
                        {\r
                                TEMPLATE_TRANSFER_BYTE(DataStream);\r
                                Length--;\r

+                               BytesInEndpoint++;\r

                        }\r
                        \r
                        }\r
                        \r

-                       LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
+                       LastPacketFull = (BytesInEndpoint == USB_ControlEndpointSize);\r

                        Endpoint_ClearIN();\r
                }\r
        }\r
                        Endpoint_ClearIN();\r
                }\r
        }\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 3bb5489..f28ed47 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -25,6 +25,7 @@
   *  - Added new EVK527 board target\r
   *  - Added new USB_Host_GetDeviceStringDescriptor() convenience function\r
   *  - Added new LEDNotification project to the library, to give a visual LED notification on new events from the host\r
   *  - Added new EVK527 board target\r
   *  - Added new USB_Host_GetDeviceStringDescriptor() convenience function\r
   *  - Added new LEDNotification project to the library, to give a visual LED notification on new events from the host\r

+  *  - Added new NO_DEVICE_REMOTE_WAKEUP and NO_DEVICE_SELF_POWER compile time options\r

   *\r
   *  <b>Changed:</b>\r
   *  - Removed code in the Keyboard demos to send zeroed reports between two reports with differing numbers of keycodes\r
   *\r
   *  <b>Changed:</b>\r
   *  - Removed code in the Keyboard demos to send zeroed reports between two reports with differing numbers of keycodes\r

diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index d8d4edb..8f8da4f 100644 (file)
--- a/LUFA/ManPages/CompileTimeTokens.txt
+++ b/LUFA/ManPages/CompileTimeTokens.txt
@@ -68,9 +68,57 @@
  *  the HID.h file documentation.\r
  *\r
  *\r
  *  the HID.h file documentation.\r
  *\r
  *\r

- *  \section Sec_SummaryUSBTokens USB Driver Related Tokens\r
+ *  \section Sec_SummaryUSBTokens General USB Driver Related Tokens\r

  *  This section describes compile tokens which affect USB driver stack as a whole in the LUFA library.\r
  *\r
  *  This section describes compile tokens which affect USB driver stack as a whole in the LUFA library.\r
  *\r

+ *  <b>NO_STREAM_CALLBACKS</b> - ( \ref Group_EndpointPacketManagement , \ref Group_PipePacketManagement )\n\r
+ *  Both the endpoint and the pipe driver code contains stream functions, allowing for arrays of data to be sent to or from the\r
+ *  host easily via a single function call (rather than complex routines worrying about sending full packets, waiting for the endpoint/\r
+ *  pipe to become ready, etc.). By default, these stream functions require a callback function which is executed after each byte processed,\r
+ *  allowing for early-aborts of stream transfers by the application. If callbacks are not required in an application, they can be removed\r
+ *  by defining this token, reducing the compiled binary size. When removed, the stream functions no longer accept a callback function as\r
+ *  a parameter.\r
+ *\r
+ *  <b>FAST_STREAM_TRANSFERS</b> - ( \ref Group_EndpointPacketManagement , \ref Group_PipePacketManagement )\n\r
+ *  By default, streams are transferred internally via a loop, sending or receiving one byte per iteration before checking for a bank full\r
+ *  or empty condition. This allows for multiple stream functions to be chained together easily, as there are no alignment issues. However,\r
+ *  this can lead to heavy performance penalties in applications where large streams are used frequently. When this compile time option is\r
+ *  used, bytes are sent or recevied in groups of 8 bytes at a time increasing performance at the expense of a larger flash memory consumption\r
+ *  due to the extra code required to deal with byte alignment.\r
+ *\r
+ *  <b>USE_STATIC_OPTIONS</b>=<i>x</i> - ( \ref Group_USBManagement ) \n\r
+ *  By default, the USB_Init() function accepts dynamic options at runtime to alter the library behaviour, including whether the USB pad\r
+ *  voltage regulator is enabled, and the device speed when in device mode. By defining this token to a mask comprised of the USB options\r
+ *  mask defines usually passed as the Options parameter to USB_Init(), the resulting compiled binary can be decreased in size by removing\r
+ *  the dynamic options code, and replacing it with the statically set options. When defined, the USB_Init() function no longer accepts an\r
+ *  Options parameter.\r
+ *\r
+ *  <b>USB_DEVICE_ONLY</b> - ( \ref Group_USBManagement ) \n\r
+ *  For the USB AVR models supporting both device and host USB modes, the USB_Init() function contains a Mode parameter which specifies the\r
+ *  mode the library should be initialized to. If only device mode is required, the code for USB host mode can be removed from the binary to\r
+ *  save space. When defined, the USB_Init() function no longer accepts a Mode parameter. This define is irrelevant on smaller USB AVRs which\r
+ *  do not support host mode.\r
+ *\r
+ *  <b>USB_HOST_ONLY</b> - ( \ref Group_USBManagement ) \n\r
+ *  Same as USB_DEVICE_ONLY, except the library is fixed to USB host mode rather than USB device mode. Not available on some USB AVR models.\r
+ *\r
+ *  <b>USB_STREAM_TIMEOUT_MS</b>=<i>x</i> - ( \ref Group_USBManagement ) \n\r
+ *  When endpoint and/or pipe stream functions are used, by default there is a timeout between each transfer which the connected device or host\r
+ *  must satisfy, or the stream function aborts the remaining data transfer. This token may be defined to a non-zero 16-bit value to set the timeout\r
+ *  period for stream transfers, specified in milliseconds. If not defined, the default value specified in LowLevel.h is used instead.\r
+ *\r
+ *  <b>NO_LIMITED_CONTROLLER_CONNECT</b> - ( \ref Group_Events ) \n\r
+ *  On the smaller USB AVRs, the USB controller lacks VBUS events to determine the physical connection state of the USB bus to a host. In lieu of\r
+ *  VBUS events, the library attempts to determine the connection state via the bus suspension and wake up events instead. This however may be\r
+ *  slightly inaccurate due to the possibility of the host suspending the bus while the device is still connected. If accurate connection status is\r
+ *  required, the VBUS line of the USB connector should be routed to an AVR pin to detect its level, so that the USB_DeviceState global\r
+ *  can be accurately set and the \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events manually raised by the RAISE_EVENT macro.\r
+ *  When defined, this token disables the library's auto-detection of the connection state by the aforementioned suspension and wake up events.\r
+ *\r
+ *\r
+ *  \section Sec_SummaryUSBDeviceTokens USB Device Mode Driver Related Tokens\r
+ *  This section describes compile tokens which affect USB driver stack of the LUFA library when used in Device mode.\r
+ *\r

  *  <b>USE_RAM_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n\r
  *  Define this token to indicate to the USB driver that all device descriptors are stored in RAM, rather than being located in any one\r
  *  of the AVR's memory spaces. RAM descriptors may be desirable in applications where the descriptors need to be modified at runtime.\r
  *  <b>USE_RAM_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n\r
  *  Define this token to indicate to the USB driver that all device descriptors are stored in RAM, rather than being located in any one\r
  *  of the AVR's memory spaces. RAM descriptors may be desirable in applications where the descriptors need to be modified at runtime.\r


@@ -101,13 +149,6 @@
  *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except\r
  *  implicitly via the library APIs.\r
  *\r
  *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except\r
  *  implicitly via the library APIs.\r
  *\r

- *  <b>HOST_STATE_AS_GPIOR</b> - ( \ref Group_Host ) \n\r
- *  One of the most frequenty used global variables in the stack is the USB_HostState global, which indicates the current state of\r
- *  the Host State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token\r
- *  may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR\r
- *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except\r
- *  implicitly via the library APIs.\r
- *\r

  *  <b>FIXED_NUM_CONFIGURATIONS</b>=<i>x</i> - ( \ref Group_Device ) \n\r
  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces\r
  *  the amount of configuration required to set up the library, and allows the value to change dynamically (if descriptors are stored in\r
  *  <b>FIXED_NUM_CONFIGURATIONS</b>=<i>x</i> - ( \ref Group_Device ) \n\r
  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces\r
  *  the amount of configuration required to set up the library, and allows the value to change dynamically (if descriptors are stored in\r


@@ -119,20 +160,31 @@
  *  is through control endpoint requests. Defining this token will remove several features related to the selection and control of device\r
  *  endpoints internally, saving space. Generally, this is usually only useful in (some) bootloaders and is best avoided.\r
  *\r
  *  is through control endpoint requests. Defining this token will remove several features related to the selection and control of device\r
  *  endpoints internally, saving space. Generally, this is usually only useful in (some) bootloaders and is best avoided.\r
  *\r

- *  <b>NO_STREAM_CALLBACKS</b> - ( \ref Group_EndpointPacketManagement , \ref Group_PipePacketManagement )\n\r
- *  Both the endpoint and the pipe driver code contains stream functions, allowing for arrays of data to be sent to or from the\r
- *  host easily via a single function call (rather than complex routines worrying about sending full packets, waiting for the endpoint/\r
- *  pipe to become ready, etc.). By default, these stream functions require a callback function which is executed after each byte processed,\r
- *  allowing for early-aborts of stream transfers by the application. If callbacks are not required in an application, they can be removed\r
- *  by defining this token, reducing the compiled binary size. When removed, the stream functions no longer accept a callback function as\r
- *  a parameter.\r
+ *  <b>INTERRUPT_CONTROL_ENDPOINT</b> - ( \ref Group_USBManagement ) \n\r
+ *  Some applications prefer to not call the USB_USBTask() management task reguarly while in device mode, as it can complicate code significantly.\r
+ *  Instead, when device mode is used this token can be passed to the library via the -D switch to allow the library to manage the USB control\r
+ *  endpoint entirely via USB controller interrupts asynchronously to the user application.\r

  *\r
  *\r

- *  <b>FAST_STREAM_TRANSFERS</b> - ( \ref Group_EndpointPacketManagement , \ref Group_PipePacketManagement )\n\r
- *  By default, streams are transferred internally via a loop, sending or receiving one byte per iteration before checking for a bank full\r
- *  or empty condition. This allows for multiple stream functions to be chained together easily, as there are no alignment issues. However,\r
- *  this can lead to heavy performance penalties in applications where large streams are used frequently. When this compile time option is\r
- *  used, bytes are sent or recevied in groups of 8 bytes at a time increasing performance at the expense of a larger flash memory consumption\r
- *  due to the extra code required to deal with byte alignment.\r
+ *  <b>NO_DEVICE_REMOTE_WAKEUP</b> - (\ref Group_Device ) \n\r
+ *  Many devices do not require the use of the Remote Wakeup features of USB, used to wake up the USB host when suspended. On these devices,\r
+ *  the code required to manage device Remote Wakeup can be disabled by defining this token and passing it to the library via the -D switch.\r
+ *\r
+ *  <b>NO_DEVICE_SELF_POWER</b> - (\ref Group_Device ) \n\r
+ *  USB devices may be bus powered, self powered, or a combination of both. When a device can be both bus powered and self powered, the host may\r
+ *  query the device to determine the current power source, via \ref USB_CurrentlySelfPowered. For solely bus powered devices, this global and the\r
+ *  code required to manage it may be disabled by passing this token to the library via the -D switch.\r
+ *\r
+ *\r
+ *  \section Sec_SummaryUSBHostTokens USB Host Mode Driver Related Tokens\r
+ *\r
+ *  This section describes compile tokens which affect USB driver stack of the LUFA library when used in Host mode.\r
+ *\r
+ *  <b>HOST_STATE_AS_GPIOR</b> - ( \ref Group_Host ) \n\r
+ *  One of the most frequenty used global variables in the stack is the USB_HostState global, which indicates the current state of\r
+ *  the Host State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token\r
+ *  may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR\r
+ *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except\r
+ *  implicitly via the library APIs.\r

  *\r
  *  <b>USB_HOST_TIMEOUT_MS</b>=<i>x</i> - ( \ref Group_Host ) \n\r
  *  When a control transfer is initiated in host mode to an attached device, a timeout is used to abort the transfer if the attached\r
  *\r
  *  <b>USB_HOST_TIMEOUT_MS</b>=<i>x</i> - ( \ref Group_Host ) \n\r
  *  When a control transfer is initiated in host mode to an attached device, a timeout is used to abort the transfer if the attached\r


@@ -144,38 +196,4 @@
  *  they will fail to enumerate correctly. By placing a delay before the enumeration process, it can be ensured that the bus has settled\r
  *  back to a known idle state before communications occur with the device. This token may be defined to a 16-bit value to set the device\r
  *  settle period, specified in milliseconds. If not defined, the default value specified in Host.h is used instead.\r
  *  they will fail to enumerate correctly. By placing a delay before the enumeration process, it can be ensured that the bus has settled\r
  *  back to a known idle state before communications occur with the device. This token may be defined to a 16-bit value to set the device\r
  *  settle period, specified in milliseconds. If not defined, the default value specified in Host.h is used instead.\r

- *\r
- *  <b>USE_STATIC_OPTIONS</b>=<i>x</i> - ( \ref Group_USBManagement ) \n\r
- *  By default, the USB_Init() function accepts dynamic options at runtime to alter the library behaviour, including whether the USB pad\r
- *  voltage regulator is enabled, and the device speed when in device mode. By defining this token to a mask comprised of the USB options\r
- *  mask defines usually passed as the Options parameter to USB_Init(), the resulting compiled binary can be decreased in size by removing\r
- *  the dynamic options code, and replacing it with the statically set options. When defined, the USB_Init() function no longer accepts an\r
- *  Options parameter.\r
- *\r
- *  <b>USB_DEVICE_ONLY</b> - ( \ref Group_USBManagement ) \n\r
- *  For the USB AVR models supporting both device and host USB modes, the USB_Init() function contains a Mode parameter which specifies the\r
- *  mode the library should be initialized to. If only device mode is required, the code for USB host mode can be removed from the binary to\r
- *  save space. When defined, the USB_Init() function no longer accepts a Mode parameter. This define is irrelevant on smaller USB AVRs which\r
- *  do not support host mode.\r
- *\r
- *  <b>USB_HOST_ONLY</b> - ( \ref Group_USBManagement ) \n\r
- *  Same as USB_DEVICE_ONLY, except the library is fixed to USB host mode rather than USB device mode. Not available on some USB AVR models.\r
- *\r
- *  <b>USB_STREAM_TIMEOUT_MS</b>=<i>x</i> - ( \ref Group_USBManagement ) \n\r
- *  When endpoint and/or pipe stream functions are used, by default there is a timeout between each transfer which the connected device or host\r
- *  must satisfy, or the stream function aborts the remaining data transfer. This token may be defined to a non-zero 16-bit value to set the timeout\r
- *  period for stream transfers, specified in milliseconds. If not defined, the default value specified in LowLevel.h is used instead.\r
- *\r
- *  <b>NO_LIMITED_CONTROLLER_CONNECT</b> - ( \ref Group_Events ) \n\r
- *  On the smaller USB AVRs, the USB controller lacks VBUS events to determine the physical connection state of the USB bus to a host. In lieu of\r
- *  VBUS events, the library attempts to determine the connection state via the bus suspension and wake up events instead. This however may be\r
- *  slightly inaccurate due to the possibility of the host suspending the bus while the device is still connected. If accurate connection status is\r
- *  required, the VBUS line of the USB connector should be routed to an AVR pin to detect its level, so that the USB_DeviceState global\r
- *  can be accurately set and the \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events manually raised by the RAISE_EVENT macro.\r
- *  When defined, this token disables the library's auto-detection of the connection state by the aforementioned suspension and wake up events.\r
- *\r
- *  <b>INTERRUPT_CONTROL_ENDPOINT</b> - ( \ref Group_USBManagement ) \n\r
- *  Some applications prefer to not call the USB_USBTask() management task reguarly while in device mode, as it can complicate code significantly.\r
- *  Instead, when device mode is used this token can be passed to the library via the -D switch to allow the library to manage the USB control\r
- *  endpoint entirely via USB controller interrupts asynchronously to the user application.\r

  */\r
  */\r