diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-12-20 13:00:49 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2009-12-20 13:00:49 +0000 |
| commit | 40ea6d099fd4936f0785756b9141fcb7773c5183 (patch) | |
| tree | daa5f27642bd8672bbb426fefccf92eb2c974c74 /Bootloaders | |
| parent | 16ef60a63074287e2f4b046e3f4565ab21f5cf95 (diff) | |
Added new NO_DEVICE_SELF_POWER and NO_DEVICE_REMOTE_WAKEUP compile time options.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@994 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/Descriptors.c | 2 | ||||
| -rw-r--r-- | Bootloaders/CDC/makefile | 2 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.c | 2 | ||||
| -rw-r--r-- | Bootloaders/DFU/makefile | 2 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/Descriptors.c | 2 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/makefile | 2 |
6 files changed, 9 insertions, 3 deletions
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index b0b1ba53..e97b9d43 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -81,7 +81,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
- .ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
+ .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED,
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 806ada2a..8d91b765 100644 --- 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
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
LUFA_OPTS += -D NO_INTERNAL_SERIAL
+LUFA_OPTS += -D NO_DEVICE_SELF_POWER
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index eb5c580b..2fed7686 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -81,7 +81,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
- .ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
+ .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED,
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 8b16c35c..cd5d2c7e 100644 --- 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
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
LUFA_OPTS += -D NO_INTERNAL_SERIAL
+LUFA_OPTS += -D NO_DEVICE_SELF_POWER
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c index b85bd7ae..14f0500e 100644 --- a/Bootloaders/TeensyHID/Descriptors.c +++ b/Bootloaders/TeensyHID/Descriptors.c @@ -101,7 +101,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR,
- .ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
+ .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED,
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile index 99e3b480..8de8f8f4 100644 --- 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
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
LUFA_OPTS += -D NO_INTERNAL_SERIAL
+LUFA_OPTS += -D NO_DEVICE_SELF_POWER
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP
# List C source files here. (C dependencies are automatically generated.)
|