Added new Relay Controller Board project (thanks to OBinou).

[pub/lufa.git] / LUFA / Drivers / USB / HighLevel / StdDescriptors.h

diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
index 17536cd..4090aaa 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
@@ -58,6 +58,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Indicates that a given descriptor does not exist in the device. This can be used inside descriptors\r
@@ -81,7 +86,7 @@
                                #define USE_INTERNAL_SERIAL           NO_DESCRIPTOR\r
                        #endif\r
                        \r
-                       /** Macro to calculate the power value for the device descriptor, from a given number of milliamps. */\r
+                       /** Macro to calculate the power value for the configuration descriptor, from a given number of milliamps. */\r
                        #define USB_CONFIG_POWER_MA(mA)           ((mA) >> 1)\r
 \r
                        /** Macro to calculate the Unicode length of a string with a given number of Unicode characters.\r
@@ -119,19 +124,18 @@
                         */\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
                         */\r
-                       #define USB_CONFIG_ATTR_SELFPOWERED       0xC0\r
+                       #define USB_CONFIG_ATTR_SELFPOWERED       0x40\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 supports the\r
                         *  remote wakeup feature of the USB standard, allowing a suspended USB device to wake up the host upon\r
                         *  request.\r
                         */\r
-                       #define USB_CONFIG_ATTR_REMOTEWAKEUP      0xA0\r
+                       #define USB_CONFIG_ATTR_REMOTEWAKEUP      0x20\r
 \r
                        /** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's\r
                         *  Attributes value to indicate that the specified endpoint is not synchronized.\r