diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-12-23 01:51:39 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-12-23 01:51:39 +0000 |
| commit | f201f6697b7f99b63389509b42112026b8f6f76f (patch) | |
| tree | 9f38b5271f3a5ff10083f4f3e27598ced92efe11 /Bootloaders/DFU | |
| parent | 77f354609f0411fb6541da31a889186ad402838e (diff) | |
| download | lufa-f201f6697b7f99b63389509b42112026b8f6f76f.tar.gz lufa-f201f6697b7f99b63389509b42112026b8f6f76f.tar.bz2 lufa-f201f6697b7f99b63389509b42112026b8f6f76f.zip | |
Run wspurify script on /trunk/ and /branches/ C source files, to remove any trailing whitespace at the end of each line.
Diffstat (limited to 'Bootloaders/DFU')
| -rw-r--r-- | Bootloaders/DFU/BootloaderAPI.h | 4 | ||||
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 9 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.c | 8 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.h | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/Bootloaders/DFU/BootloaderAPI.h b/Bootloaders/DFU/BootloaderAPI.h index fd351104e..9d652c840 100644 --- a/Bootloaders/DFU/BootloaderAPI.h +++ b/Bootloaders/DFU/BootloaderAPI.h @@ -40,9 +40,9 @@ #include <avr/io.h> #include <avr/boot.h> #include <stdbool.h> - + #include <LUFA/Common/Common.h> - + /* Function Prototypes: */ void BootloaderAPI_ErasePage(const uint32_t Address); void BootloaderAPI_WritePage(const uint32_t Address); diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 6e0c95d06..094801924 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -113,10 +113,10 @@ int main(void) /* If the TCK pin is not jumpered to ground, start the user application instead */ RunBootloader = (!(PINF & (1 << 4))); - + /* Re-enable JTAG debugging */ MCUCR &= ~(1 << JTD); - MCUCR &= ~(1 << JTD); + MCUCR &= ~(1 << JTD); #endif /* Turn on first LED on the board to indicate that the bootloader has started */ @@ -153,7 +153,7 @@ void SetupHardware(void) /* Initialize the USB subsystem */ USB_Init(); LEDs_Init(); - + /* Bootloader active LED toggle timer initialization */ TIMSK1 = (1 << TOIE1); TCCR1B = ((1 << CS11) | (1 << CS10)); @@ -181,7 +181,7 @@ ISR(TIMER1_OVF_vect, ISR_BLOCK) * internally. */ void EVENT_USB_Device_ControlRequest(void) -{ +{ /* Ignore any requests that aren't directed to the DFU interface */ if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) != (REQTYPE_CLASS | REQREC_INTERFACE)) @@ -742,3 +742,4 @@ static void ProcessReadCommand(void) else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte ResponseByte = SignatureInfo[DataIndexToRead - 0x30]; } + diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index b9c77aa9a..44170e6c6 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -159,11 +159,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, Address = &DeviceDescriptor; Size = sizeof(USB_Descriptor_Device_t); break; - case DTYPE_Configuration: + case DTYPE_Configuration: Address = &ConfigurationDescriptor; Size = sizeof(USB_Descriptor_Configuration_t); break; - case DTYPE_String: + case DTYPE_String: if (!(DescriptorNumber)) { Address = &LanguageString; @@ -174,10 +174,10 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, Address = &ProductString; Size = ProductString.Header.Size; } - + break; } - + *DescriptorAddress = Address; return Size; } diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h index 445557f70..42b4bb63f 100644 --- a/Bootloaders/DFU/Descriptors.h +++ b/Bootloaders/DFU/Descriptors.h @@ -161,7 +161,7 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; - + // DFU Interface USB_Descriptor_Interface_t DFU_Interface; USB_Descriptor_DFU_Functional_t DFU_Functional; |