diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-13 14:17:18 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-13 14:17:18 +0000 |
| commit | d83cc9ac8049f651637dc2d9b8632f3c208bbdf6 (patch) | |
| tree | 64c162999af279b6a823b26082d9f09e4fc6d210 | |
| parent | 666c0fa4c31b2c9f7f02f6d0e09551e24dc4680c (diff) | |
| download | lufa-d83cc9ac8049f651637dc2d9b8632f3c208bbdf6.tar.gz lufa-d83cc9ac8049f651637dc2d9b8632f3c208bbdf6.tar.bz2 lufa-d83cc9ac8049f651637dc2d9b8632f3c208bbdf6.zip | |
Change AVRISP-MKII and XPLAINBridge descriptors to indicate that the device is bus-powered only. Add compile time options to reduce the compiled size of the firmware.
| -rw-r--r-- | Projects/AVRISP-MKII/Descriptors.c | 2 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/V2Protocol.h | 2 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/makefile | 5 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/AVRISPDescriptors.c | 2 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.c | 2 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/makefile | 4 |
6 files changed, 11 insertions, 6 deletions
diff --git a/Projects/AVRISP-MKII/Descriptors.c b/Projects/AVRISP-MKII/Descriptors.c index a57ad06c3..95a41f18a 100644 --- a/Projects/AVRISP-MKII/Descriptors.c +++ b/Projects/AVRISP-MKII/Descriptors.c @@ -81,7 +81,7 @@ USB_Descriptor_Configuration_t PROGMEM 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/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h index 12ab5992d..a4248ddec 100644 --- a/Projects/AVRISP-MKII/Lib/V2Protocol.h +++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h @@ -70,7 +70,7 @@ #define COMMAND_TIMEOUT_TICKS 100 /** Command timeout counter register, GPIOR for speed. */ - #define TimeoutTicksRemaining GPIOR0 + #define TimeoutTicksRemaining GPIOR1 /** MUX mask for the VTARGET ADC channel number. */ #define VTARGET_ADC_CHANNEL_MASK _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL) diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index 343448998..88e186d51 100644 --- a/Projects/AVRISP-MKII/makefile +++ b/Projects/AVRISP-MKII/makefile @@ -121,7 +121,10 @@ LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_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 DEVICE_STATE_AS_GPIOR=0 +LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP +LUFA_OPTS += -D NO_DEVICE_SELF_POWER # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.c b/Projects/XPLAINBridge/AVRISPDescriptors.c index 1f2e1677c..397cb56ca 100644 --- a/Projects/XPLAINBridge/AVRISPDescriptors.c +++ b/Projects/XPLAINBridge/AVRISPDescriptors.c @@ -81,7 +81,7 @@ AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescriptor = .ConfigurationNumber = 1, .ConfigurationStrIndex = NO_DESCRIPTOR, - .ConfigAttributes = USB_CONFIG_ATTR_SELFPOWERED, + .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED, .MaxPowerConsumption = USB_CONFIG_POWER_MA(100) }, diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 329a20627..8acbacd2a 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -93,7 +93,7 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_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/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile index 1a865a110..75f51690f 100644 --- a/Projects/XPLAINBridge/makefile +++ b/Projects/XPLAINBridge/makefile @@ -123,7 +123,9 @@ LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" - +LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 +LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP +LUFA_OPTS += -D NO_DEVICE_SELF_POWER # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ |