diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-04-20 06:04:49 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-04-20 06:04:49 +0000 |
| commit | 2b0c9532a3c60ef6cc562bb1bd6c13cb68b4bb03 (patch) | |
| tree | f7df377d85533fa5fb1062480dd61f09477c5e89 /LUFA/Drivers | |
| parent | 04263de4f06e720f2bb3f8e7b5a3d5910b52978d (diff) | |
| download | lufa-2b0c9532a3c60ef6cc562bb1bd6c13cb68b4bb03.tar.gz lufa-2b0c9532a3c60ef6cc562bb1bd6c13cb68b4bb03.tar.bz2 lufa-2b0c9532a3c60ef6cc562bb1bd6c13cb68b4bb03.zip | |
Fix reversed descriptions for the AVR8 USB pad regulator enable/disable masks (thanks to Omar).
Diffstat (limited to 'LUFA/Drivers')
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h | 5 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/DeviceStandardReq.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h index a6e0067e3..6be41fd96 100644 --- a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h @@ -119,14 +119,15 @@ /** \name USB Controller Option Masks */ //@{ /** Regulator disable option mask for \ref USB_Init(). This indicates that the internal 3.3V USB data pad - * regulator should be enabled to regulate the data pin voltages to within the USB standard. + * regulator should be disabled and the AVR's VCC level used for the data pads. * * \note See USB AVR data sheet for more information on the internal pad regulator. */ #define USB_OPT_REG_DISABLED (1 << 1) /** Regulator enable option mask for \ref USB_Init(). This indicates that the internal 3.3V USB data pad - * regulator should be disabled and the AVR's VCC level used for the data pads. + * regulator should be enabled to regulate the data pin voltages from the VBUS level down to a level within + * the range allowable by the USB standard. * * \note See USB AVR data sheet for more information on the internal pad regulator. */ diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c index 2e6d8f8c0..f9c64b6f8 100644 --- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c +++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c @@ -114,7 +114,7 @@ void USB_Device_ProcessControlRequest(void) static void USB_Device_SetAddress(void) { - uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F); + uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); |