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 /LUFA | |
| 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 'LUFA')
141 files changed, 544 insertions, 498 deletions
diff --git a/LUFA/CodeTemplates/LUFAConfig.h b/LUFA/CodeTemplates/LUFAConfig.h index e1b1f3682..3f8841d3f 100644 --- a/LUFA/CodeTemplates/LUFAConfig.h +++ b/LUFA/CodeTemplates/LUFAConfig.h @@ -35,7 +35,7 @@ header, copy this into your project's root directory and supply the \c USE_LUFA_CONFIG_HEADER token to the compiler so that it is defined in all compiled source files. - + For information on what each token does, refer to the LUFA manual section "Summary of Compile Tokens". */ @@ -85,7 +85,7 @@ // #define HOST_DEVICE_SETTLE_DELAY_MS {Insert Value Here} #elif (ARCH == ARCH_XMEGA) - + /* Non-USB Related Configuration Tokens: */ // #define DISABLE_TERMINAL_CODES @@ -151,6 +151,6 @@ // #define USB_HOST_TIMEOUT_MS {Insert Value Here} // #define HOST_DEVICE_SETTLE_DELAY_MS {Insert Value Here} - #endif + #endif #endif diff --git a/LUFA/Common/ArchitectureSpecific.h b/LUFA/Common/ArchitectureSpecific.h index 1a125d6cb..48063e0d9 100644 --- a/LUFA/Common/ArchitectureSpecific.h +++ b/LUFA/Common/ArchitectureSpecific.h @@ -55,7 +55,7 @@ #if !defined(__INCLUDE_FROM_COMMON_H) #error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality. #endif - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { @@ -82,7 +82,7 @@ "M" (_SFR_IO_ADDR(MCUCR)) \ : "r0"); \ }MACROE - + /** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always * be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer * removes/reorders code to the point where break points cannot reliably be set. @@ -136,7 +136,7 @@ #define pgm_read_ptr(Address) (void*)pgm_read_word(Address) #endif #endif - + /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) } diff --git a/LUFA/Common/Architectures.h b/LUFA/Common/Architectures.h index dad3ba7d7..c8b515549 100644 --- a/LUFA/Common/Architectures.h +++ b/LUFA/Common/Architectures.h @@ -66,10 +66,10 @@ /** Selects the Atmel 32-bit UC3 AVR (AT32UC3* chips) architecture. */ #define ARCH_UC3 1 - + /** Selects the Atmel XMEGA AVR (ATXMEGA*U chips) architecture. */ #define ARCH_XMEGA 2 - + #if !defined(__DOXYGEN__) #define ARCH_ ARCH_AVR8 diff --git a/LUFA/Common/Attributes.h b/LUFA/Common/Attributes.h index 92948e10e..ccb2d43dc 100644 --- a/LUFA/Common/Attributes.h +++ b/LUFA/Common/Attributes.h @@ -133,14 +133,14 @@ * \param[in] Func Name of the function which the given function name should alias. */ #define ATTR_ALIAS(Func) __attribute__ ((alias( #Func ))) - + /** Marks a variable or struct element for packing into the smallest space available, omitting any * alignment bytes usually added between fields to optimize field accesses. */ #define ATTR_PACKED __attribute__ ((packed)) /** Indicates the minimum alignment in bytes for a variable or struct element. - * + * * \param[in] Bytes Minimum number of bytes the item should be aligned to. */ #define ATTR_ALIGNED(Bytes) __attribute__ ((aligned(Bytes))) diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h index 5ac70fe76..ea0d7073f 100644 --- a/LUFA/Common/BoardTypes.h +++ b/LUFA/Common/BoardTypes.h @@ -140,13 +140,13 @@ /** Selects the Kernel Concepts USBFOO specific board drivers, including the Button and LEDs drivers. */ #define BOARD_USBFOO 25 - + /** Selects the Sparkfun ATMEGA8U2 specific board drivers, including the driver for the board LEDs. */ #define BOARD_SPARKFUN8U2 26 /** Selects the Atmel EVK1101 specific board drivers, including the Button, Joystick and LED drivers. */ #define BOARD_EVK1101 27 - + /** Selects the Busware TUL specific board drivers, including the Button and LED drivers. */ #define BOARD_TUL 28 @@ -155,7 +155,7 @@ /** Selects the Atmel EVK1104 specific board drivers, including the Button and LED drivers. */ #define BOARD_EVK1104 30 - + /** Selects the Atmel XMEGA A3BU Xplained specific board drivers, including Dataflash, Button and LED drivers. */ #define BOARD_A3BU_XPLAINED 31 diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h index 4d08e783d..6f9936af8 100644 --- a/LUFA/Common/Common.h +++ b/LUFA/Common/Common.h @@ -42,7 +42,7 @@ * * @{ */ - + /** \defgroup Group_GlobalInt Global Interrupt Macros * \brief Convenience macros for the management of interrupts globally within the device. * @@ -54,13 +54,13 @@ /* Macros: */ #define __INCLUDE_FROM_COMMON_H - + /* Includes: */ #include <stdint.h> #include <stdbool.h> #include <string.h> #include <stddef.h> - + #if defined(USE_LUFA_CONFIG_HEADER) #include "LUFAConfig.h" #endif @@ -70,7 +70,7 @@ #include "ArchitectureSpecific.h" #include "CompilerSpecific.h" #include "Attributes.h" - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { @@ -90,9 +90,9 @@ #include <avr/eeprom.h> #include <avr/boot.h> #include <util/delay.h> - + typedef uint8_t uint_reg_t; - + #define ARCH_HAS_EEPROM_ADDRESS_SPACE #define ARCH_HAS_FLASH_ADDRESS_SPACE #define ARCH_HAS_MULTI_ADDRESS_SPACE @@ -110,7 +110,7 @@ // ================================================= typedef uint32_t uint_reg_t; - + #define ARCH_BIG_ENDIAN #include "Endianness.h" @@ -120,15 +120,15 @@ #include <avr/pgmspace.h> #include <avr/eeprom.h> #include <util/delay.h> - + typedef uint8_t uint_reg_t; - + #define ARCH_HAS_EEPROM_ADDRESS_SPACE #define ARCH_HAS_FLASH_ADDRESS_SPACE #define ARCH_HAS_MULTI_ADDRESS_SPACE #define ARCH_LITTLE_ENDIAN - #include "Endianness.h" + #include "Endianness.h" #else #error Unknown device architecture specified. #endif @@ -176,7 +176,7 @@ #if !defined(MIN) || defined(__DOXYGEN__) #define MIN(x, y) (((x) < (y)) ? (x) : (y)) #endif - + #if !defined(STRINGIFY) || defined(__DOXYGEN__) /** Converts the given input into a string, via the C Preprocessor. This macro puts literal quotation * marks around the input, converting the source into a string literal. @@ -256,7 +256,7 @@ while (Milliseconds--) { __builtin_mtsr(AVR32_COUNT, 0); - while (__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000)); + while (__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000)); } #elif (ARCH == ARCH_XMEGA) if (GCC_IS_COMPILE_CONST(Milliseconds)) @@ -267,7 +267,7 @@ { while (Milliseconds--) _delay_ms(1); - } + } #endif } @@ -316,12 +316,12 @@ else __builtin_csrf(AVR32_SR_GM_OFFSET); #elif (ARCH == ARCH_XMEGA) - SREG = GlobalIntState; + SREG = GlobalIntState; #endif - + GCC_MEMORY_BARRIER(); } - + /** Enables global interrupt handling for the device, allowing interrupts to be handled. * * \ingroup Group_GlobalInt @@ -340,7 +340,7 @@ #endif GCC_MEMORY_BARRIER(); - } + } /** Disabled global interrupt handling for the device, preventing interrupts from being handled. * diff --git a/LUFA/Common/CompilerSpecific.h b/LUFA/Common/CompilerSpecific.h index 96d37cd74..9186135b8 100644 --- a/LUFA/Common/CompilerSpecific.h +++ b/LUFA/Common/CompilerSpecific.h @@ -43,7 +43,7 @@ * * Compiler specific definitions to expose certain compiler features which may increase the level of code optimization * for a specific compiler, or correct certain issues that may be present such as memory barriers for use in conjunction - * with atomic variable access. + * with atomic variable access. * * Where possible, on alternative compilers, these macros will either have no effect, or default to returning a sane value * so that they can be used in existing code without the need for extra compiler checks in the user application code. @@ -77,7 +77,7 @@ * assembly output in an unexpected manner on sections of code that are ordering-specific. */ #define GCC_MEMORY_BARRIER() __asm__ __volatile__("" ::: "memory"); - + /** Evaluates to boolean true if the specified value can be determined at compile time to be a constant value * when compiling under GCC. * diff --git a/LUFA/Common/Endianness.h b/LUFA/Common/Endianness.h index 6b57ed61a..f0b5b19a1 100644 --- a/LUFA/Common/Endianness.h +++ b/LUFA/Common/Endianness.h @@ -65,7 +65,7 @@ #if !defined(__INCLUDE_FROM_COMMON_H) #error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality. #endif - + #if !(defined(ARCH_BIG_ENDIAN) || defined(ARCH_LITTLE_ENDIAN)) #error ARCH_BIG_ENDIAN or ARCH_LITTLE_ENDIAN not set for the specified architecture. #endif @@ -115,11 +115,11 @@ #define CPU_TO_LE16(x) SWAPENDIAN_16(x) #define CPU_TO_LE32(x) SWAPENDIAN_32(x) #define CPU_TO_BE16(x) (x) - #define CPU_TO_BE32(x) (x) + #define CPU_TO_BE32(x) (x) #elif !defined(le16_to_cpu) /** \name Run-time endianness conversion */ //@{ - + /** Performs a conversion between a Little Endian encoded 16-bit piece of data and the * Endianness of the currently selected CPU architecture. * @@ -398,7 +398,7 @@ { if (GCC_IS_COMPILE_CONST(Word)) return SWAPENDIAN_16(Word); - + uint8_t Temp; union @@ -486,3 +486,4 @@ #endif /** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h b/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h index dfb77fa38..04a6a8485 100644 --- a/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h @@ -124,3 +124,4 @@ #endif /** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h index 696530173..19d19ee7d 100644 --- a/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h +++ b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h @@ -66,7 +66,7 @@ /* Macros: */ #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)) #define JOY_CMASK (1 << 6) - + #define JOY_PORTC_MASK_SHIFT 3 #endif diff --git a/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h b/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h index b24c9bc29..4cb6aeb08 100644 --- a/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h @@ -127,3 +127,4 @@ #endif /** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h b/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h index 9030326e1..f211e652c 100644 --- a/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ @@ -9,13 +9,13 @@ /* Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in + without fee, provided that the above copyright notice appear in all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -82,7 +82,7 @@ DDRB |= LEDS_ALL_LEDS; PORTB &= ~LEDS_ALL_LEDS; } - + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { PORTB |= LEDMask; @@ -97,18 +97,18 @@ { PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LEDMask); } - + static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) { PORTB = ((PORTB & ~LEDMask) | ActiveMask); } - + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { PORTB ^= LEDMask; } - + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { @@ -120,7 +120,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h b/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h index 0d645c514..ef30a9b4c 100644 --- a/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h +++ b/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ @@ -9,13 +9,13 @@ /* Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in + without fee, provided that the above copyright notice appear in all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -35,7 +35,7 @@ * \note This file should not be included directly. It is automatically included as needed by the Buttons driver * dispatch header located in LUFA/Drivers/Board/Buttons.h. */ - + /** \ingroup Group_Buttons * \defgroup Group_Buttons_MINIMUS MINIMUS * \brief Board specific Buttons driver header for the MINIMUS. @@ -60,12 +60,12 @@ #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Button mask for the first button on the board. */ #define BUTTONS_BUTTON1 (1 << 7) - + /* Inline Functions: */ #if !defined(__DOXYGEN__) static inline void Buttons_Init(void) @@ -85,7 +85,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h b/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h index a7325482a..124fbaaad 100644 --- a/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ @@ -9,13 +9,13 @@ /* Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in + without fee, provided that the above copyright notice appear in all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -82,7 +82,7 @@ DDRD |= LEDS_ALL_LEDS; PORTD |= LEDS_ALL_LEDS; } - + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { PORTD &= ~LEDMask; @@ -97,18 +97,18 @@ { PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask); } - + static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) { PORTD = ((PORTD & ~LEDMask) | ActiveMask); } - + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { PORTD ^= LEDMask; } - + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { @@ -120,7 +120,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/STK525/Joystick.h b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h index 3504d184d..dcf7f2eda 100644 --- a/LUFA/Drivers/Board/AVR8/STK525/Joystick.h +++ b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h @@ -66,7 +66,7 @@ /* Macros: */ #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_EMASK ((1 << 4) | (1 << 5)) - + #define JOY_PORTE_MASK_SHIFT 1 #endif diff --git a/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h index 63b96b0df..1722fe7d3 100644 --- a/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h @@ -35,7 +35,7 @@ * \note This file should not be included directly. It is automatically included as needed by the LEDs driver * dispatch header located in LUFA/Drivers/Board/LEDs.h. */ - + /** \ingroup Group_LEDs * \defgroup Group_LEDs_TEENSY2 TEENSY2 * \brief Board specific LED driver header for the PJRC Teensy 2 boards. @@ -88,7 +88,7 @@ DDRD |= LEDS_ALL_LEDS; #if (BOARD == BOARD_TEENSY2) - PORTD &= ~LEDS_ALL_LEDS; + PORTD &= ~LEDS_ALL_LEDS; #else PORTD |= LEDS_ALL_LEDS; #endif @@ -97,7 +97,7 @@ static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { #if (BOARD == BOARD_TEENSY2) - PORTD |= LEDMask; + PORTD |= LEDMask; #else PORTD &= ~LEDMask; #endif @@ -106,7 +106,7 @@ static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { #if (BOARD == BOARD_TEENSY2) - PORTD &= ~LEDMask; + PORTD &= ~LEDMask; #else PORTD |= LEDMask; #endif @@ -125,7 +125,7 @@ const uint8_t ActiveMask) { #if (BOARD == BOARD_TEENSY2) - PORTD = ((PORTD & ~LEDMask) | ActiveMask); + PORTD = ((PORTD & ~LEDMask) | ActiveMask); #else PORTD = ((PORTD | LEDMask) & ~ActiveMask); #endif @@ -140,7 +140,7 @@ static inline uint8_t LEDs_GetLEDs(void) { #if (BOARD == BOARD_TEENSY2) - return (PORTD & LEDS_ALL_LEDS); + return (PORTD & LEDS_ALL_LEDS); #else return (~PORTD & LEDS_ALL_LEDS); #endif diff --git a/LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h b/LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h index bbb1b5cc7..4e1e50033 100644 --- a/LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h +++ b/LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h @@ -99,3 +99,4 @@ /** @} */
+ diff --git a/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h b/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h index 97a24ba69..541da264c 100644 --- a/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h @@ -170,3 +170,4 @@ /** @} */
+ diff --git a/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h b/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h index 65f348178..5e80a5368 100644 --- a/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h +++ b/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h @@ -66,7 +66,7 @@ /* Macros: */ #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_EMASK ((1 << 4) | (1 << 5)) - + #define JOY_PORTE_MASK_SHIFT 1 #endif diff --git a/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h b/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h index f7bb39873..e4a7002a5 100644 --- a/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h @@ -130,3 +130,4 @@ #endif /** @} */ + diff --git a/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h index ebbd21128..6a867cafa 100644 --- a/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h +++ b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h @@ -35,7 +35,7 @@ * \note This file should not be included directly. It is automatically included as needed by the dataflash driver * dispatch header located in LUFA/Drivers/Board/Dataflash.h. */ - + /** \ingroup Group_Dataflash * \defgroup Group_Dataflash_XPLAIN_REV1 XPLAIN_REV1 * \brief Board specific Dataflash driver header for the original Atmel XPLAIN, revision 1. diff --git a/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h index 50e150e8a..3abe98eeb 100644 --- a/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h @@ -35,7 +35,7 @@ * \note This file should not be included directly. It is automatically included as needed by the LEDs driver * dispatch header located in LUFA/Drivers/Board/LEDs.h. */ - + /** \ingroup Group_LEDs * \defgroup Group_LEDs_XPLAIN_REV1 XPLAIN_REV1 * \brief Board specific LED driver header for the original Atmel XPLAIN, revision 1. diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h index 67bbc0b8c..f60dbb50b 100644 --- a/LUFA/Drivers/Board/Buttons.h +++ b/LUFA/Drivers/Board/Buttons.h @@ -78,7 +78,7 @@ * // Display which button was pressed (assuming two board buttons) * printf("Button pressed: %s\r\n", (ButtonPress == BUTTONS_BUTTON1) ? "Button 1" : "Button 2"); * \endcode - * + * * @{ */ diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h index f3d6dc4b2..cd85237d3 100644 --- a/LUFA/Drivers/Board/Dataflash.h +++ b/LUFA/Drivers/Board/Dataflash.h @@ -233,7 +233,7 @@ #elif (BOARD == BOARD_EVK527) #include "AVR8/EVK527/Dataflash.h" #elif (BOARD == BOARD_A3BU_XPLAINED) - #include "XMEGA/A3BU_XPLAINED/Dataflash.h" + #include "XMEGA/A3BU_XPLAINED/Dataflash.h" #else #include "Board/Dataflash.h" #endif diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h index afbe97d81..95e90fadf 100644 --- a/LUFA/Drivers/Board/Joystick.h +++ b/LUFA/Drivers/Board/Joystick.h @@ -76,7 +76,7 @@ * * // Display which direction the joystick was moved in * printf("Joystick moved:\r\n"); - * + * * if (JoystickMovement & (JOY_UP | JOY_DOWN)) * printf("%s ", (JoystickMovement & JOY_UP) ? "Up" : "Down"); * diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index 55920d0a5..e1f6b4c5c 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -78,13 +78,13 @@ * LEDs_Init(); * * // Turn on each of the four LEDs in turn - * LEDs_SetAllLEDs(LEDS_LED1); + * LEDs_SetAllLEDs(LEDS_LED1); * Delay_MS(500); - * LEDs_SetAllLEDs(LEDS_LED1); + * LEDs_SetAllLEDs(LEDS_LED1); * Delay_MS(500); - * LEDs_SetAllLEDs(LEDS_LED1); + * LEDs_SetAllLEDs(LEDS_LED1); * Delay_MS(500); - * LEDs_SetAllLEDs(LEDS_LED1); + * LEDs_SetAllLEDs(LEDS_LED1); * Delay_MS(500); * * // Turn on all LEDs @@ -166,7 +166,7 @@ #elif (BOARD == BOARD_EVK1101) #include "UC3/EVK1101/LEDs.h" #elif (BOARD == BOARD_TUL) - #include "AVR8/TUL/LEDs.h" + #include "AVR8/TUL/LEDs.h" #elif (BOARD == BOARD_EVK1100) #include "UC3/EVK1100/LEDs.h" #elif (BOARD == BOARD_EVK1104) diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h index b41c76290..8b3844242 100644 --- a/LUFA/Drivers/Board/Temperature.h +++ b/LUFA/Drivers/Board/Temperature.h @@ -60,7 +60,7 @@ * // Display converted temperature in degrees Celsius * printf("Current Temperature: %d Degrees\r\n", Temperature_GetTemperature()); * \endcode - * + * * @{ */ @@ -91,7 +91,7 @@ /** ADC channel MUX mask for the temperature sensor. */ #define TEMP_ADC_CHANNEL_MASK ADC_CHANNEL0 - + /** Size of the temperature sensor lookup table, in lookup values */ #define TEMP_TABLE_SIZE 120 diff --git a/LUFA/Drivers/Board/UC3/EVK1100/Buttons.h b/LUFA/Drivers/Board/UC3/EVK1100/Buttons.h index 2f05f2c10..10f02cf6a 100644 --- a/LUFA/Drivers/Board/UC3/EVK1100/Buttons.h +++ b/LUFA/Drivers/Board/UC3/EVK1100/Buttons.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -44,7 +44,7 @@ * * @{ */ - + #ifndef __BUTTONS_EVK1100_H__ #define __BUTTONS_EVK1100_H__ @@ -60,7 +60,7 @@ #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif - + /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ @@ -97,7 +97,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/UC3/EVK1100/Joystick.h b/LUFA/Drivers/Board/UC3/EVK1100/Joystick.h index e35d1b336..aaf729b02 100644 --- a/LUFA/Drivers/Board/UC3/EVK1100/Joystick.h +++ b/LUFA/Drivers/Board/UC3/EVK1100/Joystick.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -44,7 +44,7 @@ * * @{ */ - + #ifndef __JOYSTICK_EVK1100_H__ #define __JOYSTICK_EVK1100_H__ @@ -67,7 +67,7 @@ #define JOY_PORT 0 #define JOY_MASK ((1UL << 28) | (1UL << 27) | (1UL << 26) | (1UL << 25) | (1UL << 20)) #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Mask for the joystick being pushed in the left direction. */ @@ -84,7 +84,7 @@ /** Mask for the joystick being pushed inward. */ #define JOY_PRESS (1UL << 20) - + /* Inline Functions: */ #if !defined(__DOXYGEN__) static inline void Joystick_Init(void) @@ -92,7 +92,7 @@ AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK; AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK; }; - + static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t Joystick_GetStatus(void) { @@ -108,3 +108,4 @@ #endif /** @} */ + diff --git a/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h index 484cedeaf..6fd1ac8c2 100644 --- a/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h +++ b/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -92,7 +92,7 @@ /** LED mask for the eighth LED on the board. */ #define LEDS_LED8 (1UL << 30) - + /** LED mask for all the LEDs on the board. */ #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4 \ LEDS_LED5 | LEDS_LED6 | LEDS_LED7 | LEDS_LED8) @@ -108,7 +108,7 @@ AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; } - + static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask) { AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; @@ -124,7 +124,7 @@ AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; } - + static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask) { AVR32_GPIO.port[LEDS_PORT].ovrs = LEDMask; @@ -135,7 +135,7 @@ { AVR32_GPIO.port[LEDS_PORT].ovrt = LEDMask; } - + static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t LEDs_GetLEDs(void) { @@ -147,7 +147,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h b/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h index f6770a221..18c711706 100644 --- a/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h +++ b/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -44,7 +44,7 @@ * * @{ */ - + #ifndef __BUTTONS_EVK1101_H__ #define __BUTTONS_EVK1101_H__ @@ -60,7 +60,7 @@ #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif - + /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ @@ -94,7 +94,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h b/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h index 892474db7..0481f8335 100644 --- a/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h +++ b/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -44,7 +44,7 @@ * * @{ */ - + #ifndef __JOYSTICK_EVK1101_H__ #define __JOYSTICK_EVK1101_H__ @@ -69,7 +69,7 @@ #define JOY_PRESS_PORT 0 #define JOY_PRESS_MASK (1UL << 13) #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Mask for the joystick being pushed in the left direction. */ @@ -86,7 +86,7 @@ /** Mask for the joystick being pushed inward. */ #define JOY_PRESS (1UL << 13) - + /* Inline Functions: */ #if !defined(__DOXYGEN__) static inline void Joystick_Init(void) @@ -97,7 +97,7 @@ AVR32_GPIO.port[JOY_MOVE_PORT].puers = JOY_MOVE_MASK; AVR32_GPIO.port[JOY_PRESS_PORT].puers = JOY_PRESS_MASK; }; - + static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t Joystick_GetStatus(void) { @@ -114,3 +114,4 @@ #endif /** @} */ + diff --git a/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h index 08b19fba4..6feadbce3 100644 --- a/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h +++ b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -95,7 +95,7 @@ AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; } - + static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask) { AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; @@ -111,7 +111,7 @@ AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; } - + static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask) { AVR32_GPIO.port[LEDS_PORT].ovrs = LEDMask; @@ -122,7 +122,7 @@ { AVR32_GPIO.port[LEDS_PORT].ovrt = LEDMask; } - + static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t LEDs_GetLEDs(void) { @@ -134,7 +134,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h b/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h index 0b30c2315..934f92265 100644 --- a/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h +++ b/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -44,7 +44,7 @@ * * @{ */ - + #ifndef __BUTTONS_EVK1104_H__ #define __BUTTONS_EVK1104_H__ @@ -60,7 +60,7 @@ #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif - + /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ @@ -91,7 +91,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h index 6e26cc893..5813e892c 100644 --- a/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h +++ b/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -100,7 +100,7 @@ AVR32_GPIO.port[3].oders = LEDS_LEDMASK3; AVR32_GPIO.port[3].ovrs = LEDS_LEDMASK3; } - + static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask) { AVR32_GPIO.port[2].ovrc = (LEDMask & LEDS_LEDMASK2); @@ -121,7 +121,7 @@ AVR32_GPIO.port[3].ovrs = LEDS_LEDMASK3; AVR32_GPIO.port[3].ovrc = (LEDMask & LEDS_LEDMASK3); } - + static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask) { AVR32_GPIO.port[2].ovrs = (LEDMask & LEDS_LEDMASK2); @@ -136,7 +136,7 @@ AVR32_GPIO.port[2].ovrt = (LEDMask & LEDS_LEDMASK2); AVR32_GPIO.port[3].ovrt = (LEDMask & LEDS_LEDMASK3); } - + static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t LEDs_GetLEDs(void) { @@ -148,7 +148,8 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ + diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h index 9da328de2..1665fa4b1 100644 --- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h +++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -44,7 +44,7 @@ * * @{ */ - + #ifndef __BUTTONS_A3BU_XPLAINED_H__ #define __BUTTONS_A3BU_XPLAINED_H__ @@ -78,7 +78,7 @@ { PORTE_OUTCLR = BUTTONS_BUTTON1; PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3); - + PORTE_PIN5CTRL = PORT_OPC_PULLUP_gc; PORTF_PIN1CTRL = PORT_OPC_PULLUP_gc; PORTF_PIN2CTRL = PORT_OPC_PULLUP_gc; @@ -100,4 +100,3 @@ /** @} */ - diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h index c49ad03bd..d555ac211 100644 --- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h +++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -124,4 +124,3 @@ /** @} */ - diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h index 5b509b605..4b98498eb 100644 --- a/LUFA/Drivers/Misc/RingBuffer.h +++ b/LUFA/Drivers/Misc/RingBuffer.h @@ -39,7 +39,7 @@ * or deletions) must not overlap. If there is possibility of two or more of the same kind of * operating occurring at the same point in time, atomic (mutex) locking should be used. */ - + /** \ingroup Group_MiscDrivers * \defgroup Group_RingBuff Generic Byte Ring Buffer - LUFA/Drivers/Misc/RingBuffer.h * \brief Lightweight ring buffer, for fast insertion/deletion of bytes. @@ -134,7 +134,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Buffer->In = DataPtr; Buffer->Out = DataPtr; Buffer->Start = &DataPtr[0]; @@ -166,7 +166,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Count = Buffer->Count; SetGlobalInterruptMask(CurrentGlobalInt); @@ -244,7 +244,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Buffer->Count++; SetGlobalInterruptMask(CurrentGlobalInt); @@ -264,7 +264,7 @@ static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer) { GCC_FORCE_POINTER_ACCESS(Buffer); - + uint8_t Data = *Buffer->Out; if (++Buffer->Out == Buffer->End) @@ -272,7 +272,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Buffer->Count--; SetGlobalInterruptMask(CurrentGlobalInt); diff --git a/LUFA/Drivers/Misc/TerminalCodes.h b/LUFA/Drivers/Misc/TerminalCodes.h index f8c51bcbd..01260183e 100644 --- a/LUFA/Drivers/Misc/TerminalCodes.h +++ b/LUFA/Drivers/Misc/TerminalCodes.h @@ -115,7 +115,7 @@ */ #define ESC_STRIKETHROUGH_OFF ANSI_ESCAPE_SEQUENCE("29m") //@} - + /** \name Text Colour Control Sequences */ //@{ /** Sets the foreground (text) colour to black. */ diff --git a/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h index a0e9a87a3..fe0173057 100644 --- a/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h +++ b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h @@ -104,7 +104,7 @@ #define _ADC_GET_MUX_MASK2(y) ADC_CHANNEL ## y #define _ADC_GET_MUX_MASK(y) _ADC_GET_MUX_MASK2(y) #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** \name ADC Reference Configuration Masks */ @@ -118,7 +118,7 @@ /** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */ #define ADC_REFERENCE_INT2560MV ((1 << REFS1) | (1 << REFS0)) //@} - + /** \name ADC Result Adjustment Configuration Masks */ //@{ /** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the @@ -144,7 +144,7 @@ */ #define ADC_SINGLE_CONVERSION (0 << ADATE) //@} - + /** \name ADC Prescaler Configuration Masks */ //@{ /** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */ diff --git a/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h index 48b8740fe..d6dc248f7 100644 --- a/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h +++ b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h @@ -70,7 +70,7 @@ * // Send a byte, and store the received byte from the same transaction * uint8_t ResponseByte = SPI_TransferByte(0xDC); * \endcode - * + * * @{ */ @@ -139,7 +139,7 @@ /** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */ #define SPI_SAMPLE_TRAILING (1 << CPHA) //@} - + /** \name SPI Data Ordering Configuration Masks */ //@{ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */ @@ -148,7 +148,7 @@ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */ #define SPI_ORDER_LSB_FIRST (1 << DORD) //@} - + /** \name SPI Mode Configuration Masks */ //@{ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */ @@ -157,7 +157,7 @@ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */ #define SPI_MODE_MASTER (1 << MSTR) //@} - + /* Inline Functions: */ /** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other * SPI routines. @@ -195,7 +195,7 @@ SPCR = 0; SPSR = 0; } - + /** Retrieves the currently selected SPI mode, once the SPI interface has been configured. * * \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c index 7b7f5d61f..70f9f5853 100644 --- a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c +++ b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c @@ -87,3 +87,4 @@ void Serial_SendData(const uint8_t* Buffer, uint16_t Length) while (Length--) Serial_SendByte(*(Buffer++)); } + diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h index 639b3c3b4..55e18f9f2 100644 --- a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h +++ b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h @@ -70,7 +70,7 @@ /* Includes: */ #include "../../../Common/Common.h" #include "../../Misc/TerminalCodes.h" - + #include <stdio.h> /* Enable C linkage for C++ Compilers: */ @@ -87,7 +87,7 @@ #if !defined(__DOXYGEN__) /* External Variables: */ extern FILE USARTSerialStream; - + /* Function Prototypes: */ int Serial_putchar(char DataByte, FILE *Stream); @@ -127,7 +127,7 @@ * \param[in] StringPtr Pointer to a string located in SRAM space. */ void Serial_SendString(const char* StringPtr) ATTR_NON_NULL_PTR_ARG(1); - + /** Transmits a given buffer located in SRAM memory through the USART. * * \param[in] Buffer Pointer to a buffer containing the data to send. @@ -190,7 +190,7 @@ stdin = Stream; stdout = Stream; } - + *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW); } @@ -244,7 +244,7 @@ { if (!(Serial_IsCharReceived())) return -1; - + return UDR1; } diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c index d6db37d6e..b77aa0822 100644 --- a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c +++ b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c @@ -119,9 +119,9 @@ bool TWI_ReceiveByte(uint8_t* const Byte, TWCR = TWCRMask; while (!(TWCR & (1 << TWINT))); *Byte = TWDR; - + uint8_t Status = (TWSR & TW_STATUS_MASK); - + return ((LastByte) ? (Status == TW_MR_DATA_NACK) : (Status == TW_MR_DATA_ACK)); } @@ -133,19 +133,19 @@ uint8_t TWI_ReadPacket(const uint8_t SlaveAddress, uint8_t Length) { uint8_t ErrorCode; - + if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE, TimeoutMS)) == TWI_ERROR_NoError) { while (InternalAddressLen--) { if (!(TWI_SendByte(*(InternalAddress++)))) - { + { ErrorCode = TWI_ERROR_SlaveNAK; break; } } - + if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_READ, TimeoutMS)) == TWI_ERROR_NoError) { @@ -157,11 +157,11 @@ uint8_t TWI_ReadPacket(const uint8_t SlaveAddress, break; } } - + TWI_StopTransmission(); } } - + return ErrorCode; } @@ -180,7 +180,7 @@ uint8_t TWI_WritePacket(const uint8_t SlaveAddress, while (InternalAddressLen--) { if (!(TWI_SendByte(*(InternalAddress++)))) - { + { ErrorCode = TWI_ERROR_SlaveNAK; break; } @@ -194,9 +194,10 @@ uint8_t TWI_WritePacket(const uint8_t SlaveAddress, break; } } - + TWI_StopTransmission(); } - + return ErrorCode; } + diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h index 5a6c2966a..75dffb585 100644 --- a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h +++ b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h @@ -88,7 +88,7 @@ * } * } * \endcode - * + * * <b>High Level API Example:</b> * \code * // Initialize the TWI driver before first use at 200KHz @@ -154,10 +154,10 @@ * or \ref TWI_ADDRESS_WRITE to obtain the device's read and write address respectively. */ #define TWI_DEVICE_ADDRESS_MASK 0xFE - + /** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 1. */ #define TWI_BIT_PRESCALE_1 ((0 << TWPS1) | (0 << TWPS0)) - + /** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 4. */ #define TWI_BIT_PRESCALE_4 ((0 << TWPS1) | (1 << TWPS0)) @@ -166,7 +166,7 @@ /** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 64. */ #define TWI_BIT_PRESCALE_64 ((1 << TWPS1) | (1 << TWPS0)) - + /** Calculates the length of each bit on the TWI bus for a given target frequency. This may be used with * the \ref TWI_Init() function to convert a bus frequency to a number of clocks for the \c BitLength * parameter. @@ -189,7 +189,7 @@ TWI_ERROR_SlaveNotReady = 4, /**< Slave NAKed the TWI bus START condition. */ TWI_ERROR_SlaveNAK = 5, /**< Slave NAKed whilst attempting to send data to the device. */ }; - + /* Inline Functions: */ /** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be * before any other TWI operations. @@ -256,7 +256,7 @@ const bool LastByte) ATTR_NON_NULL_PTR_ARG(1); bool TWI_ReceiveByte(uint8_t* const Byte, const bool LastByte); - + /** High level function to perform a complete packet transfer over the TWI bus to the specified * device. * diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h index 3902a9090..49a07b58b 100644 --- a/LUFA/Drivers/Peripheral/SPI.h +++ b/LUFA/Drivers/Peripheral/SPI.h @@ -67,9 +67,10 @@ #if (ARCH == ARCH_AVR8) #include "AVR8/SPI_AVR8.h" #elif (ARCH == ARCH_XMEGA) - #include "XMEGA/SPI_XMEGA.h" + #include "XMEGA/SPI_XMEGA.h" #else #error The SPI peripheral driver is not currently available for your selected architecture. #endif #endif + diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h index 856c54bc7..d216b7568 100644 --- a/LUFA/Drivers/Peripheral/Serial.h +++ b/LUFA/Drivers/Peripheral/Serial.h @@ -71,3 +71,4 @@ #endif #endif + diff --git a/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h index 91e86c38f..0fe714299 100644 --- a/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h +++ b/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h @@ -67,7 +67,7 @@ * // Send a byte, and store the received byte from the same transaction * uint8_t ResponseByte = SPI_TransferByte(&SPIC, 0xDC); * \endcode - * + * * @{ */ @@ -136,7 +136,7 @@ /** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */ #define SPI_SAMPLE_TRAILING SPI_MODE0_bm //@} - + /** \name SPI Data Ordering Configuration Masks */ //@{ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */ @@ -145,7 +145,7 @@ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */ #define SPI_ORDER_LSB_FIRST SPI_DORD_bm //@} - + /** \name SPI Mode Configuration Masks */ //@{ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */ @@ -154,7 +154,7 @@ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */ #define SPI_MODE_MASTER SPI_MASTER_bm //@} - + /* Inline Functions: */ /** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other * SPI routines. @@ -177,7 +177,7 @@ { SPI->CTRL &= ~SPI_ENABLE_bm; } - + /** Retrieves the currently selected SPI mode, once the SPI interface has been configured. * * \param[in, out] SPI Pointer to the base of the SPI peripheral within the device. diff --git a/LUFA/Drivers/USB/Class/AndroidAccessoryClass.h b/LUFA/Drivers/USB/Class/AndroidAccessoryClass.h index 00eedd8e8..c2528d99e 100644 --- a/LUFA/Drivers/USB/Class/AndroidAccessoryClass.h +++ b/LUFA/Drivers/USB/Class/AndroidAccessoryClass.h @@ -73,3 +73,4 @@ /** @} */
+ diff --git a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h index 45e7ca540..b9a8dd53a 100644 --- a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h @@ -125,3 +125,4 @@ /** @} */
+ diff --git a/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h index 32a66409b..8f9a10758 100644 --- a/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h @@ -218,7 +218,7 @@ * allows for pitch adjustments to be made via control requests directed at the endpoint. */ #define AUDIO_EP_PITCH_CONTROL (1 << 1) - + /* Enums: */ /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Audio * device class. @@ -244,7 +244,7 @@ * interface belongs to the Streaming Audio protocol. */ }; - + /** Audio class specific interface description subtypes, for the Audio Control interface. */ enum Audio_CSInterface_AC_SubTypes_t { @@ -287,7 +287,7 @@ AUDIO_REQ_GetMemory = 0x85, /**< Audio class-specific request to get the memory value of a parameter within the device. */ AUDIO_REQ_GetStatus = 0xFF, /**< Audio class-specific request to get the device status. */ }; - + /** Enum for Audio class specific Endpoint control modifiers which can be set and retrieved by a USB host, if the corresponding * endpoint control is indicated to be supported in the Endpoint's Audio-class specific endpoint descriptor. */ diff --git a/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h index 45e0c5851..1d01c82f5 100644 --- a/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h @@ -111,7 +111,7 @@ */ #define CDC_CONTROL_LINE_IN_OVERRUNERROR (1 << 6) //@} - + /** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a * uniform structure but variable sized data payloads, thus cannot be represented accurately by * a single typedef struct. A macro is used instead so that functional descriptors can be created @@ -161,7 +161,7 @@ * belongs to no specific protocol of the CDC data class. */ }; - + /** Enum for the CDC class specific control requests that can be issued by the USB bus host. */ enum CDC_ClassRequests_t { @@ -355,7 +355,7 @@ uint8_t bMasterInterface; /**< Interface number of the CDC Control interface. */ uint8_t bSlaveInterface0; /**< Interface number of the CDC Data interface. */ } ATTR_PACKED USB_CDC_StdDescriptor_FunctionalUnion_t; - + /** \brief CDC Virtual Serial Port Line Encoding Settings Structure. * * Type define for a CDC Line Encoding structure, used to hold the various encoding parameters for a virtual diff --git a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h index 95b3484fd..6e5187bbf 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h @@ -91,7 +91,7 @@ /** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */ #define HID_KEYBOARD_MODIFIER_RIGHTGUI (1 << 7) //@} - + /** \name Keyboard Standard Report LED Masks */ //@{ /** Constant for a keyboard output report LED byte, indicating that the host's NUM LOCK mode is currently set. */ @@ -108,7 +108,7 @@ //@} /** \name Keyboard Standard Report Key Scan-codes */ - //@{ + //@{ #define HID_KEYBOARD_SC_ERROR_ROLLOVER 0x01 #define HID_KEYBOARD_SC_POST_FAIL 0x02 #define HID_KEYBOARD_SC_ERROR_UNDEFINED 0x03 @@ -208,7 +208,7 @@ #define HID_KEYBOARD_SC_KEYPAD_9_AND_PAGE_UP 0x61 #define HID_KEYBOARD_SC_KEYPAD_0_AND_INSERT 0x62 #define HID_KEYBOARD_SC_KEYPAD_DOT_AND_DELETE 0x63 - #define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE 0x64 + #define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE 0x64 #define HID_KEYBOARD_SC_POWER 0x66 #define HID_KEYBOARD_SC_EQUAL_SIGN 0x67 #define HID_KEYBOARD_SC_F13 0x68 @@ -496,7 +496,7 @@ * \param[in] VendorPageNum Vendor Defined HID Usage Page index, ranging from 0x00 to 0xFF. * \param[in] CollectionUsage Vendor Usage for the encompassing report IN and OUT collection, ranging from 0x00 to 0xFF. * \param[in] DataINUsage Vendor Usage for the IN report data, ranging from 0x00 to 0xFF. - * \param[in] DataOUTUsage Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF. + * \param[in] DataOUTUsage Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF. * \param[in] NumBytes Length of the data IN and OUT reports. */ #define HID_DESCRIPTOR_VENDOR(VendorPageNum, CollectionUsage, DataINUsage, DataOUTUsage, NumBytes) \ @@ -517,7 +517,7 @@ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \ HID_RI_END_COLLECTION(0) //@} - + /* Type Defines: */ /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the HID * device class. @@ -543,7 +543,7 @@ * belongs to the Mouse HID boot protocol. */ }; - + /** Enum for the HID class specific control requests that can be issued by the USB bus host. */ enum HID_ClassRequests_t { diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.c b/LUFA/Drivers/USB/Class/Common/HIDParser.c index 903b039df..24b284c1d 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDParser.c +++ b/LUFA/Drivers/USB/Class/Common/HIDParser.c @@ -98,7 +98,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, case HID_RI_USAGE_PAGE(0): if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32) CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16); - + CurrStateTable->Attributes.Usage.Page = ReportItemData; break; case HID_RI_LOGICAL_MINIMUM(0): @@ -359,3 +359,4 @@ uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData, return 0; } + diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.h b/LUFA/Drivers/USB/Class/Common/HIDParser.h index 3e3bb237e..25e201b36 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDParser.h +++ b/LUFA/Drivers/USB/Class/Common/HIDParser.h @@ -71,7 +71,7 @@ #include "HIDReportData.h" #include "HIDClassCommon.h" - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { diff --git a/LUFA/Drivers/USB/Class/Common/HIDReportData.h b/LUFA/Drivers/USB/Class/Common/HIDReportData.h index 2b96eeabc..2c36e8ea8 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDReportData.h +++ b/LUFA/Drivers/USB/Class/Common/HIDReportData.h @@ -63,15 +63,15 @@ #define HID_RI_DATA_BITS_32 0x03 #define HID_RI_DATA_BITS(DataBits) HID_RI_DATA_BITS_ ## DataBits - #define _HID_RI_ENCODE_0(Data) + #define _HID_RI_ENCODE_0(Data) #define _HID_RI_ENCODE_8(Data) , (Data & 0xFF) #define _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_8(Data) _HID_RI_ENCODE_8(Data >> 8) #define _HID_RI_ENCODE_32(Data) _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_16(Data >> 16) #define _HID_RI_ENCODE(DataBits, ...) _HID_RI_ENCODE_ ## DataBits(__VA_ARGS__) - + #define _HID_RI_ENTRY(Type, Tag, DataBits, ...) (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__)) #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** \name HID Input, Output and Feature Report Descriptor Item Flags */ @@ -95,7 +95,7 @@ #define HID_IOF_BUFFERED_BYTES (1 << 8) #define HID_IOF_BITFIELD (0 << 8) //@} - + /** \name HID Report Descriptor Item Macros */ //@{ #define HID_RI_INPUT(DataBits, ...) _HID_RI_ENTRY(HID_RI_TYPE_MAIN , 0x80, DataBits, __VA_ARGS__) diff --git a/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h b/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h index 49246ba7d..9d37b3db5 100644 --- a/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h @@ -117,7 +117,7 @@ /** SCSI Command Code for a MODE SENSE (10) command. */ #define SCSI_CMD_MODE_SENSE_10 0x5A //@} - + /** \name SCSI Sense Key Values */ //@{ /** SCSI Sense Code to indicate no error has occurred. */ @@ -164,7 +164,7 @@ /** SCSI Sense Code to indicate that the source data did not match the data read from the medium. */ #define SCSI_SENSE_KEY_MISCOMPARE 0x0E //@} - + /** \name SCSI Additional Sense Codes */ //@{ /** SCSI Additional Sense Code to indicate no additional sense information is available. */ @@ -196,7 +196,7 @@ /** SCSI Additional Sense Code to indicate that no removable medium is inserted into the device. */ #define SCSI_ASENSE_MEDIUM_NOT_PRESENT 0x3A //@} - + /** \name SCSI Additional Sense Key Code Qualifiers */ //@{ /** SCSI Additional Sense Qualifier Code to indicate no additional sense qualifier information is available. */ @@ -213,7 +213,7 @@ /** SCSI Additional Sense Qualifier Code to indicate that an operation is currently in progress. */ #define SCSI_ASENSEQ_OPERATION_IN_PROGRESS 0x07 //@} - + /* Enums: */ /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Mass * Storage device class. @@ -231,7 +231,7 @@ * belongs to the Bulk Only Transport protocol of the Mass Storage class. */ }; - + /** Enum for the Mass Storage class specific control requests that can be issued by the USB bus host. */ enum MS_ClassRequests_t { diff --git a/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h b/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h index 3d52be306..c370bbc9b 100644 --- a/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h @@ -92,7 +92,7 @@ * belongs to the Bidirectional protocol of the Printer class. */ }; - + /** Enum for the Printer class specific control requests that can be issued by the USB bus host. */ enum PRNT_ClassRequests_t { @@ -106,7 +106,7 @@ PRNT_REQ_SoftReset = 0x02, /**< Printer class-specific request to reset the device, ready for new * printer commands. */ - }; + }; /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h index 30840f5a3..82c2a9592 100644 --- a/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h @@ -113,7 +113,7 @@ #define REMOTE_NDIS_MEDIA_STATE_CONNECTED 0x00000000UL #define REMOTE_NDIS_MEDIA_STATE_DISCONNECTED 0x00000001UL //@} - + /** \name RNDIS Media Types */ //@{ #define REMOTE_NDIS_MEDIUM_802_3 0x00000000UL @@ -124,7 +124,7 @@ #define REMOTE_NDIS_DF_CONNECTIONLESS 0x00000001UL #define REMOTE_NDIS_DF_CONNECTION_ORIENTED 0x00000002UL //@} - + /** \name RNDIS Packet Types */ //@{ #define REMOTE_NDIS_PACKET_DIRECTED 0x00000001UL @@ -140,7 +140,7 @@ #define REMOTE_NDIS_PACKET_FUNCTIONAL 0x00004000UL #define REMOTE_NDIS_PACKET_MAC_FRAME 0x00008000UL //@} - + /** \name RNDIS OID Values */ //@{ #define OID_GEN_SUPPORTED_LIST 0x00010101UL diff --git a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c index d8c5d29eb..3ac47d567 100644 --- a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c @@ -50,16 +50,16 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT) { bool EndpointFilterMatch = false; - + EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataINEndpointNumber && ((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_IN | AudioInterfaceInfo->Config.DataINEndpointNumber))); - + EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataOUTEndpointNumber && ((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber))); if (!(EndpointFilterMatch)) return; - } + } switch (USB_ControlRequest.bRequest) { @@ -92,20 +92,20 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi uint8_t EndpointProperty = USB_ControlRequest.bRequest; uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); - + if (CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress, EndpointControl, NULL, NULL)) { uint16_t ValueLength = USB_ControlRequest.wLength; uint8_t Value[ValueLength]; - + Endpoint_ClearSETUP(); Endpoint_Read_Control_Stream_LE(Value, ValueLength); - Endpoint_ClearIN(); + Endpoint_ClearIN(); CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress, EndpointControl, &ValueLength, Value); - } + } } break; @@ -126,7 +126,7 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi { Endpoint_ClearSETUP(); Endpoint_Write_Control_Stream_LE(Value, ValueLength); - Endpoint_ClearOUT(); + Endpoint_ClearOUT(); } } @@ -180,3 +180,4 @@ void Audio_Device_Event_Stub(void) } #endif + diff --git a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h index 0f2185b8b..aba4248fc 100644 --- a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h +++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h @@ -126,7 +126,7 @@ * \param[in,out] AudioInterfaceInfo Pointer to a structure containing an Audio Class configuration and state. */ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); - + /** Audio class driver callback for the setting and retrieval of streaming endpoint properties. This callback must be implemented * in the user application to handle property manipulations on streaming audio endpoints. * @@ -357,12 +357,12 @@ /* Function Prototypes: */ #if defined(__INCLUDE_FROM_AUDIO_DEVICE_C) void Audio_Device_Event_Stub(void) ATTR_CONST; - + void EVENT_Audio_Device_StreamStartStop(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(Audio_Device_Event_Stub); #endif - #endif + #endif /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c index e3b05e037..016744087 100644 --- a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c @@ -78,7 +78,7 @@ void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInter Endpoint_ClearOUT(); Endpoint_ClearStatusStage(); - + EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo); } diff --git a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h index 24942560f..a172e4ac1 100644 --- a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h +++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h @@ -334,7 +334,7 @@ #endif void CDC_Device_Event_Stub(void) ATTR_CONST; - + void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub); void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) diff --git a/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c index 9b5a7dd35..071f55f49 100644 --- a/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c @@ -64,7 +64,7 @@ void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInter memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportData, HIDInterfaceInfo->Config.PrevReportINBufferSize); } - + Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP); Endpoint_ClearSETUP(); @@ -84,7 +84,7 @@ void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInter Endpoint_ClearSETUP(); Endpoint_Read_Control_Stream_LE(ReportData, ReportSize); Endpoint_ClearIN(); - + CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportType, &ReportData[ReportID ? 1 : 0], ReportSize - (ReportID ? 1 : 0)); } diff --git a/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h index 350978033..603b05f61 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h +++ b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h @@ -91,7 +91,7 @@ } Config; /**< Config data for the USB class interface within the device. All elements in this section * <b>must</b> be set or the interface will fail to enumerate and operate correctly. */ - + struct { // No state information for this class diff --git a/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c index 1e3fe3412..d95b95e0d 100644 --- a/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c @@ -160,7 +160,7 @@ static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInte uint16_t BytesProcessed; Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber); - + BytesProcessed = 0; while (Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock, (sizeof(MS_CommandBlockWrapper_t) - 16), &BytesProcessed) == @@ -231,8 +231,9 @@ static void MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInt if (MSInterfaceInfo->State.IsMassStoreReset) return; } - + Endpoint_ClearIN(); } #endif + diff --git a/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c index 12115ee5e..1db5ec42c 100644 --- a/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c @@ -238,7 +238,7 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* const uint16_t ResponseSize; QUERY_Response->MessageType = CPU_TO_LE32(REMOTE_NDIS_QUERY_CMPLT); - + if (RNDIS_Device_ProcessNDISQuery(RNDISInterfaceInfo, Query_Oid, QueryData, le32_to_cpu(QUERY_Message->InformationBufferLength), ResponseData, &ResponseSize)) { @@ -453,7 +453,7 @@ bool RNDIS_Device_IsPacketReceived(USB_ClassInfo_RNDIS_Device_t* const RNDISInte { return false; } - + Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpointNumber); return Endpoint_IsOUTReceived(); } @@ -467,15 +467,15 @@ uint8_t RNDIS_Device_ReadPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfa { return ENDPOINT_RWSTREAM_DeviceDisconnected; } - + Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpointNumber); - + *PacketLength = 0; if (!(Endpoint_IsOUTReceived())) return ENDPOINT_RWSTREAM_NoError; - RNDIS_Packet_Message_t RNDISPacketHeader; + RNDIS_Packet_Message_t RNDISPacketHeader; Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t), NULL); if (le32_to_cpu(RNDISPacketHeader.DataLength) > ETHERNET_FRAME_SIZE_MAX) @@ -484,12 +484,12 @@ uint8_t RNDIS_Device_ReadPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfa return RNDIS_ERROR_LOGICAL_CMD_FAILED; } - + *PacketLength = (uint16_t)le32_to_cpu(RNDISPacketHeader.DataLength); Endpoint_Read_Stream_LE(Buffer, *PacketLength, NULL); Endpoint_ClearOUT(); - + return ENDPOINT_RWSTREAM_NoError; } @@ -504,7 +504,7 @@ uint8_t RNDIS_Device_SendPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfa { return ENDPOINT_RWSTREAM_DeviceDisconnected; } - + Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataINEndpointNumber); if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError) diff --git a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c index 8ff64299f..2bac70dad 100644 --- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c @@ -443,3 +443,4 @@ static int AOA_Host_getchar_Blocking(FILE* Stream) #endif
+ diff --git a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h index 262ecbe73..a6d024a41 100644 --- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h +++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h @@ -325,3 +325,4 @@ /** @} */
+ diff --git a/LUFA/Drivers/USB/Class/Host/AudioClassHost.c b/LUFA/Drivers/USB/Class/Host/AudioClassHost.c index af6f0ec53..8caea9be1 100644 --- a/LUFA/Drivers/USB/Class/Host/AudioClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/AudioClassHost.c @@ -68,7 +68,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa return AUDIO_ENUMERROR_NoCompatibleInterfaceFound; } - AudioControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t); + AudioControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t); if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) @@ -78,7 +78,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa } AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t); - + DataINEndpoint = NULL; DataOUTEndpoint = NULL; @@ -125,7 +125,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa { continue; } - + if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) { @@ -137,7 +137,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa AudioInterfaceInfo->State.StreamingInterfaceNumber = AudioStreamingInterface->InterfaceNumber; AudioInterfaceInfo->State.EnabledStreamingAltIndex = AudioStreamingInterface->AlternateSetting; AudioInterfaceInfo->State.IsActive = true; - + return AUDIO_ENUMERROR_NoError; } @@ -225,7 +225,7 @@ uint8_t Audio_Host_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const Audi RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT); else RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT); - + Pipe_SelectPipe(DataPipeIndex); EndpointAddress = Pipe_GetBoundEndpointAddress(); diff --git a/LUFA/Drivers/USB/Class/Host/AudioClassHost.h b/LUFA/Drivers/USB/Class/Host/AudioClassHost.h index 1940c0de5..781220ee6 100644 --- a/LUFA/Drivers/USB/Class/Host/AudioClassHost.h +++ b/LUFA/Drivers/USB/Class/Host/AudioClassHost.h @@ -98,7 +98,7 @@ */ uint8_t ControlInterfaceNumber; /**< Interface index of the Audio Control interface within the attached device. */ uint8_t StreamingInterfaceNumber; /**< Interface index of the Audio Streaming interface within the attached device. */ - + uint8_t EnabledStreamingAltIndex; /**< Alternative setting index of the Audio Streaming interface when the stream is enabled. */ uint16_t DataINPipeSize; /**< Size in bytes of the Audio interface's IN data pipe. */ @@ -331,7 +331,7 @@ const int8_t Sample) { (void)AudioInterfaceInfo; - + Pipe_Write_8(Sample); if (!(Pipe_IsReadWriteAllowed())) @@ -357,7 +357,7 @@ const int16_t Sample) { (void)AudioInterfaceInfo; - + Pipe_Write_16_LE(Sample); if (!(Pipe_IsReadWriteAllowed())) @@ -395,7 +395,7 @@ Pipe_Freeze(); } } - + /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Function Prototypes: */ diff --git a/LUFA/Drivers/USB/Class/Host/CDCClassHost.c b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c index 184406643..dfe491ad7 100644 --- a/LUFA/Drivers/USB/Class/Host/CDCClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c @@ -145,13 +145,13 @@ uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo { continue; } - + if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) { return CDC_ENUMERROR_PipeConfigurationFailed; } - + if (InterruptPeriod) Pipe_SetInterruptPeriod(InterruptPeriod); } diff --git a/LUFA/Drivers/USB/Class/Host/CDCClassHost.h b/LUFA/Drivers/USB/Class/Host/CDCClassHost.h index 247bf2426..3ab01927a 100644 --- a/LUFA/Drivers/USB/Class/Host/CDCClassHost.h +++ b/LUFA/Drivers/USB/Class/Host/CDCClassHost.h @@ -334,7 +334,7 @@ #endif void CDC_Host_Event_Stub(void) ATTR_CONST; - + void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Host_Event_Stub); diff --git a/LUFA/Drivers/USB/Class/Host/HIDClassHost.c b/LUFA/Drivers/USB/Class/Host/HIDClassHost.c index 88e3c4993..5254f71c4 100644 --- a/LUFA/Drivers/USB/Class/Host/HIDClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/HIDClassHost.c @@ -118,7 +118,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo { if (DataOUTEndpoint == NULL) continue; - + Size = le16_to_cpu(DataOUTEndpoint->EndpointSize); EndpointAddress = DataOUTEndpoint->EndpointAddress; Token = PIPE_TOKEN_OUT; @@ -139,7 +139,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo { return HID_ENUMERROR_PipeConfigurationFailed; } - + if (InterruptPeriod) Pipe_SetInterruptPeriod(InterruptPeriod); } diff --git a/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c index 109b075d9..6795d2adb 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c @@ -171,7 +171,7 @@ void MIDI_Host_USBTask(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo) #if !defined(NO_CLASS_DRIVER_AUTOFLUSH) MIDI_Host_Flush(MIDIInterfaceInfo); - #endif + #endif } uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo) diff --git a/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c index 8a69d1578..7422a5e1a 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c @@ -103,7 +103,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, Token = PIPE_TOKEN_OUT; Type = EP_TYPE_BULK; DoubleBanked = MSInterfaceInfo->Config.DataOUTPipeDoubleBank; - + MSInterfaceInfo->State.DataOUTPipeSize = DataOUTEndpoint->EndpointSize; } else @@ -186,7 +186,7 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf { return ErrorCode; } - + Pipe_ClearOUT(); Pipe_WaitUntilReady(); @@ -195,14 +195,14 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf if (BufferPtr != NULL) { ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr); - + if ((ErrorCode != PIPE_RWSTREAM_NoError) && (ErrorCode != PIPE_RWSTREAM_PipeStalled)) { Pipe_Freeze(); return ErrorCode; } } - + MS_CommandStatusWrapper_t SCSIStatusBlock; return MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSIStatusBlock); } @@ -348,9 +348,9 @@ uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo) if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful) return ErrorCode; - + Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber); - + if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful) return ErrorCode; diff --git a/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h index c03ba2027..772c46bc1 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h +++ b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h @@ -149,7 +149,7 @@ void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3); /** Sends a MASS STORAGE RESET control request to the attached device, resetting the Mass Storage Interface - * and readying it for the next Mass Storage command. This should be called after a failed SCSI request to + * and readying it for the next Mass Storage command. This should be called after a failed SCSI request to * ensure the attached Mass Storage device is ready to receive the next command. * * \param[in,out] MSInterfaceInfo Pointer to a structure containing a MS Class host configuration and state. diff --git a/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c index 61f14020c..c06968c23 100644 --- a/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c @@ -147,13 +147,13 @@ uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfa { continue; } - + if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) { return CDC_ENUMERROR_PipeConfigurationFailed; } - + if (InterruptPeriod) Pipe_SetInterruptPeriod(InterruptPeriod); } @@ -241,7 +241,7 @@ static uint8_t RNDIS_SendEncapsulatedCommand(USB_ClassInfo_RNDIS_Host_t* const R }; Pipe_SelectPipe(PIPE_CONTROLPIPE); - + return USB_Host_SendControlRequest(Buffer); } @@ -259,7 +259,7 @@ static uint8_t RNDIS_GetEncapsulatedResponse(USB_ClassInfo_RNDIS_Host_t* const R }; Pipe_SelectPipe(PIPE_CONTROLPIPE); - + return USB_Host_SendControlRequest(Buffer); } diff --git a/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c index 31f581355..62fe4e585 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c @@ -133,13 +133,13 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, { continue; } - + if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) { return SI_ENUMERROR_PipeConfigurationFailed; } - + if (InterruptPeriod) Pipe_SetInterruptPeriod(InterruptPeriod); } diff --git a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h index 7da3bb2f3..97de0555b 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h @@ -54,7 +54,7 @@ #include "../StdDescriptors.h" #include "../USBInterrupt.h" #include "../Endpoint.h" - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { @@ -99,7 +99,7 @@ */ #define USB_DEVICE_OPT_FULLSPEED (0 << 0) //@} - + #if (!defined(NO_INTERNAL_SERIAL) && \ (defined(USB_SERIES_7_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_4_AVR) || \ (defined(USB_SERIES_2_AVR) && (!defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__))) || \ @@ -119,7 +119,7 @@ * model. */ #define INTERNAL_SERIAL_LENGTH_BITS 80 - + /** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller * model. */ @@ -129,8 +129,8 @@ #define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_START_ADDRESS 0 - #endif - + #endif + /* Function Prototypes: */ /** Sends a Remote Wakeup request to the host. This signals to the host that the device should * be taken out of suspended mode, and communications should resume. @@ -221,14 +221,14 @@ { return (UDADDR & (1 << ADDEN)); } - + #if (USE_INTERNAL_SERIAL != NO_DESCRIPTOR) static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1); static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) { uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS; for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++) @@ -246,7 +246,7 @@ UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ? (('A' - 10) + SerialByte) : ('0' + SerialByte)); } - + SetGlobalInterruptMask(CurrentGlobalInt); } #endif diff --git a/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c index 09907596b..ff85e0444 100644 --- a/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c +++ b/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c @@ -268,3 +268,4 @@ uint8_t Endpoint_Null_Stream(uint16_t Length, #endif
#endif + diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c index 9f7cec15e..218dcf96e 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c +++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c @@ -52,7 +52,7 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, UECFG1X = UECFG1XData; return Endpoint_IsConfigured(); -#else +#else for (uint8_t EPNum = Number; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++) { uint8_t UECFG0XTemp; @@ -60,7 +60,7 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, uint8_t UEIENXTemp; Endpoint_SelectEndpoint(EPNum); - + if (EPNum == Number) { UECFG0XTemp = UECFG0XData; @@ -84,11 +84,11 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, UECFG0X = UECFG0XTemp; UECFG1X = UECFG1XTemp; UEIENX = UEIENXTemp; - + if (!(Endpoint_IsConfigured())) - return false; + return false; } - + Endpoint_SelectEndpoint(Number); return true; #endif @@ -155,7 +155,7 @@ uint8_t Endpoint_WaitUntilReady(void) if (Endpoint_IsOUTReceived()) return ENDPOINT_READYWAIT_NoError; } - + uint8_t USB_DeviceState_LCL = USB_DeviceState; if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h index 6aff5cc2c..25a07755d 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h @@ -144,7 +144,7 @@ #endif /* Public Interface - May be used in end-application: */ - /* Macros: */ + /* Macros: */ /** \name Endpoint Bank Mode Masks */ //@{ /** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates diff --git a/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c index 55cd8f991..dde5b1b0f 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c +++ b/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c @@ -254,7 +254,7 @@ static void USB_Host_ResetDevice(void) USB_Host_ResetBus(); while (!(USB_Host_IsBusResetComplete())); USB_Host_ResumeBus(); - + USB_Host_ConfigurationNumber = 0; bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI); diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c index 9484abed3..a484df13b 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c +++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c @@ -56,7 +56,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number, Pipe_SetInfiniteINRequests(); return Pipe_IsConfigured(); -#else +#else for (uint8_t PNum = Number; PNum < PIPE_TOTAL_PIPES; PNum++) { uint8_t UPCFG0XTemp; @@ -65,7 +65,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number, uint8_t UPIENXTemp; Pipe_SelectPipe(PNum); - + if (PNum == Number) { UPCFG0XTemp = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0)); @@ -83,7 +83,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number, if (!(UPCFG1XTemp & (1 << ALLOC))) continue; - + Pipe_DisablePipe(); UPCFG1X &= ~(1 << ALLOC); @@ -94,12 +94,12 @@ bool Pipe_ConfigurePipe(const uint8_t Number, UPIENX = UPIENXTemp; Pipe_SetInfiniteINRequests(); - + if (!(Pipe_IsConfigured())) - return false; + return false; } - - Pipe_SelectPipe(Number); + + Pipe_SelectPipe(Number); return true; #endif } diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h index 277e28290..308bd34e1 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h @@ -139,7 +139,7 @@ */ #define PIPE_TOKEN_OUT (2 << PTOKEN0) //@} - + /** \name Pipe Bank Mode Masks */ //@{ /** Mask for the bank mode selection for the \ref Pipe_ConfigurePipe() macro. This indicates that the pipe @@ -425,7 +425,7 @@ PIPE_ERRORFLAG_DATATGL)) | (UPSTAX & (PIPE_ERRORFLAG_OVERFLOW | PIPE_ERRORFLAG_UNDERFLOW))); } - + /** Retrieves the number of busy banks in the currently selected pipe, which have been queued for * transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the * \ref Pipe_ClearIN() command. diff --git a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c index 68f645b89..55d137ba3 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c +++ b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c @@ -81,3 +81,4 @@ uint8_t TEMPLATE_FUNC_NAME (void* const Buffer, #undef TEMPLATE_TRANSFER_BYTE #endif + diff --git a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c index 5d4fc42f2..36685f0c4 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c +++ b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c @@ -90,3 +90,4 @@ uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer, #undef TEMPLATE_TRANSFER_BYTE #endif + diff --git a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c index 46b006364..7ed192df7 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c +++ b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c @@ -86,3 +86,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer, #undef TEMPLATE_BUFFER_MOVE #endif + diff --git a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c index bc8570d01..daba216ac 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c +++ b/LUFA/Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c @@ -48,7 +48,7 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer, Length -= *BytesProcessed; TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed); } - + while (Length) { if (!(Pipe_IsReadWriteAllowed())) @@ -85,3 +85,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer, #undef TEMPLATE_BUFFER_MOVE #endif + diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c index 9f688db06..c660fb3ba 100644 --- a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c +++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c @@ -162,7 +162,7 @@ void USB_ResetInterface(void) { #if defined(USB_CAN_BE_HOST) USB_PLL_On(); - while (!(USB_PLL_IsReady())); + while (!(USB_PLL_IsReady())); #endif } @@ -191,7 +191,7 @@ static void USB_Init_Device(void) #if !defined(FIXED_CONTROL_ENDPOINT_SIZE) USB_Descriptor_Device_t* DeviceDescriptorPtr; - + #if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \ !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)) uint8_t DescriptorAddressSpace; @@ -215,7 +215,7 @@ static void USB_Init_Device(void) #else USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size); #endif - } + } #endif #endif @@ -255,7 +255,7 @@ static void USB_Init_Host(void) USB_INT_Enable(USB_INT_SRPI); USB_INT_Enable(USB_INT_BCERRI); - + USB_Attach(); } #endif diff --git a/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h index 6115ec6e3..dad55f101 100644 --- a/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h @@ -136,7 +136,7 @@ OTGIEN |= (1 << VBERRE); break; case USB_INT_SRPI: - OTGIEN |= (1 << SRPE); + OTGIEN |= (1 << SRPE); break; #endif } @@ -194,12 +194,12 @@ OTGIEN &= ~(1 << VBERRE); break; case USB_INT_SRPI: - OTGIEN &= ~(1 << SRPE); + OTGIEN &= ~(1 << SRPE); break; #endif } } - + static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Clear(const uint8_t Interrupt) { @@ -257,7 +257,7 @@ #endif } } - + static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) { @@ -300,10 +300,10 @@ return (OTGIEN & (1 << SRPE)); #endif } - + return false; } - + static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) { diff --git a/LUFA/Drivers/USB/Core/ConfigDescriptor.h b/LUFA/Drivers/USB/Core/ConfigDescriptor.h index b34937a96..361ffa0df 100644 --- a/LUFA/Drivers/USB/Core/ConfigDescriptor.h +++ b/LUFA/Drivers/USB/Core/ConfigDescriptor.h @@ -52,7 +52,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" #include "HostStandardReq.h" #include "StdDescriptors.h" @@ -266,7 +266,7 @@ void** CurrConfigLoc) { uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size; - + if (*BytesRem < CurrDescriptorSize) CurrDescriptorSize = *BytesRem; diff --git a/LUFA/Drivers/USB/Core/Device.h b/LUFA/Drivers/USB/Core/Device.h index ad837e148..fcc1b1cc3 100644 --- a/LUFA/Drivers/USB/Core/Device.h +++ b/LUFA/Drivers/USB/Core/Device.h @@ -51,7 +51,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" #include "StdDescriptors.h" #include "USBInterrupt.h" #include "Endpoint.h" @@ -145,7 +145,7 @@ #elif (ARCH == ARCH_UC3) #include "UC3/Device_UC3.h" #elif (ARCH == ARCH_XMEGA) - #include "XMEGA/Device_XMEGA.h" + #include "XMEGA/Device_XMEGA.h" #endif /* Disable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c index 59d3f2896..5e89659d0 100644 --- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c +++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c @@ -124,7 +124,7 @@ static void USB_Device_SetAddress(void) uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Endpoint_ClearSETUP(); Endpoint_ClearStatusStage(); @@ -133,7 +133,7 @@ static void USB_Device_SetAddress(void) USB_Device_SetDeviceAddress(DeviceAddress); USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default; - + SetGlobalInterruptMask(CurrentGlobalInt); } @@ -156,7 +156,7 @@ static void USB_Device_SetConfiguration(void) uint8_t MemoryAddressSpace; #endif #endif - + if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr #if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \ !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)) @@ -185,7 +185,7 @@ static void USB_Device_SetConfiguration(void) } #else if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations) - return; + return; #endif #endif @@ -224,7 +224,7 @@ static void USB_Device_GetInternalSerialDescriptor(void) SignatureDescriptor.Header.Type = DTYPE_String; SignatureDescriptor.Header.Size = USB_STRING_LEN(INTERNAL_SERIAL_LENGTH_BITS / 4); - + USB_Device_GetSerialString(SignatureDescriptor.UnicodeString); Endpoint_ClearSETUP(); diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.h b/LUFA/Drivers/USB/Core/DeviceStandardReq.h index f47d8f644..2369f4853 100644 --- a/LUFA/Drivers/USB/Core/DeviceStandardReq.h +++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.h @@ -43,7 +43,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" #include "StdDescriptors.h" #include "Events.h" #include "StdRequestType.h" diff --git a/LUFA/Drivers/USB/Core/Endpoint.h b/LUFA/Drivers/USB/Core/Endpoint.h index 1ce7b50e7..8c895fd33 100644 --- a/LUFA/Drivers/USB/Core/Endpoint.h +++ b/LUFA/Drivers/USB/Core/Endpoint.h @@ -74,7 +74,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Core/EndpointStream.h b/LUFA/Drivers/USB/Core/EndpointStream.h index 9afb4d203..4236253dd 100644 --- a/LUFA/Drivers/USB/Core/EndpointStream.h +++ b/LUFA/Drivers/USB/Core/EndpointStream.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ @@ -9,13 +9,13 @@ /* Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in + without fee, provided that the above copyright notice appear in all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -36,7 +36,7 @@ * dispatch header located in LUFA/Drivers/USB/USB.h. */ -/** \ingroup Group_EndpointRW +/** \ingroup Group_EndpointRW * \defgroup Group_EndpointStreamRW Read/Write of Multi-Byte Streams * \brief Endpoint data stream transmission and reception management. * @@ -44,7 +44,7 @@ * and to endpoints. * * @{ - */ + */ #ifndef __ENDPOINT_STREAM_H__ #define __ENDPOINT_STREAM_H__ @@ -89,7 +89,7 @@ * again to process the next chunk of data in the transfer. */ }; - + /** Enum for the possible error return codes of the \c Endpoint_*_Control_Stream_* functions. */ enum Endpoint_ControlStream_RW_ErrorCodes_t { @@ -110,7 +110,7 @@ #elif (ARCH == ARCH_UC3) #include "UC3/EndpointStream_UC3.h" #elif (ARCH == ARCH_XMEGA) - #include "XMEGA/EndpointStream_XMEGA.h" + #include "XMEGA/EndpointStream_XMEGA.h" #endif /* Disable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/USB/Core/Events.h b/LUFA/Drivers/USB/Core/Events.h index 8afd3b53c..f40766103 100644 --- a/LUFA/Drivers/USB/Core/Events.h +++ b/LUFA/Drivers/USB/Core/Events.h @@ -217,7 +217,7 @@ void EVENT_USB_Device_Disconnect(void); /** Event for control requests. This event fires when a the USB host issues a control request - * to the mandatory device control endpoint (of address 0). This may either be a standard + * to the mandatory device control endpoint (of address 0). This may either be a standard * request that the library may have a handler code for internally, or a class specific request * issued to the device which must be handled appropriately. If a request is not processed in the * user application via this event, it will be passed to the library for processing internally diff --git a/LUFA/Drivers/USB/Core/Host.h b/LUFA/Drivers/USB/Core/Host.h index a7e647dc1..adfdc253a 100644 --- a/LUFA/Drivers/USB/Core/Host.h +++ b/LUFA/Drivers/USB/Core/Host.h @@ -51,7 +51,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) @@ -108,16 +108,16 @@ * bus address is being set. */ HOST_STATE_Default_PostAddressSet = 9, /**< This state indicates that the device's address has now been set, and the - * stack is has now completed the device enumeration process. This state causes + * stack is has now completed the device enumeration process. This state causes * the stack to change the current USB device address to that set for the * connected device, before progressing to the \ref HOST_STATE_Addressed state * ready for use in the user application. */ HOST_STATE_Addressed = 10, /**< Indicates that the device has been enumerated and addressed, and is now waiting - * for the user application to configure the device ready for use. + * for the user application to configure the device ready for use. */ HOST_STATE_Configured = 11, /**< Indicates that the device has been configured into a valid device configuration, - * ready for general use by the user application. + * ready for general use by the user application. */ }; diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.c b/LUFA/Drivers/USB/Core/HostStandardReq.c index bb8ade3a1..cb0bc7624 100644 --- a/LUFA/Drivers/USB/Core/HostStandardReq.c +++ b/LUFA/Drivers/USB/Core/HostStandardReq.c @@ -65,9 +65,9 @@ uint8_t USB_Host_SendControlRequest(void* const BufferPtr) uint8_t* HeaderStream = (uint8_t*)&USB_ControlRequest; for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Request_Header_t); HeaderByte++) - Pipe_Write_8(*(HeaderStream++)); + Pipe_Write_8(*(HeaderStream++)); #endif - + Pipe_ClearSETUP(); if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful) @@ -201,7 +201,7 @@ uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber) }; Pipe_SelectPipe(PIPE_CONTROLPIPE); - + if ((ErrorCode = USB_Host_SendControlRequest(NULL)) == HOST_SENDCONTROL_Successful) { USB_Host_ConfigurationNumber = ConfigNumber; diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.h b/LUFA/Drivers/USB/Core/HostStandardReq.h index 7b456c701..d076a8a66 100644 --- a/LUFA/Drivers/USB/Core/HostStandardReq.h +++ b/LUFA/Drivers/USB/Core/HostStandardReq.h @@ -69,7 +69,7 @@ */ #define USB_HOST_TIMEOUT_MS 1000 #endif - + /* Enums: */ /** Enum for the \ref USB_Host_SendControlRequest() return code, indicating the reason for the error * if the transfer of the request is unsuccessful. @@ -101,7 +101,7 @@ * \ingroup Group_Host */ extern uint8_t USB_Host_ConfigurationNumber; - + /* Function Prototypes: */ /** Sends the request stored in the \ref USB_ControlRequest global structure to the attached device, * and transfers the data stored in the buffer to the device, or from the device to the buffer @@ -130,7 +130,7 @@ * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. */ uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber); - + /** Sends a GET CONFIGURATION standard request to the attached device, to retrieve the currently selected * device configuration index. * @@ -239,7 +239,7 @@ { return USB_Host_GetDescriptor(DTYPE_Device, 0, DeviceDescriptorPtr, sizeof(USB_Descriptor_Device_t)); } - + /** Sends a GET DESCRIPTOR standard request to the attached device, requesting the string descriptor * of the specified index. This can be used to easily retrieve string descriptors from the device by * index, after the index is obtained from the Device or Configuration descriptors. This is a convenience diff --git a/LUFA/Drivers/USB/Core/OTG.h b/LUFA/Drivers/USB/Core/OTG.h index 59cb36833..01cc059ac 100644 --- a/LUFA/Drivers/USB/Core/OTG.h +++ b/LUFA/Drivers/USB/Core/OTG.h @@ -52,8 +52,8 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" - + #include "USBMode.h" + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { diff --git a/LUFA/Drivers/USB/Core/PipeStream.h b/LUFA/Drivers/USB/Core/PipeStream.h index 5d821f50a..0712f6597 100644 --- a/LUFA/Drivers/USB/Core/PipeStream.h +++ b/LUFA/Drivers/USB/Core/PipeStream.h @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ @@ -9,13 +9,13 @@ /* Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in + without fee, provided that the above copyright notice appear in all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -27,7 +27,7 @@ arising out of or in connection with the use or performance of this software. */ - + /** \file * \brief Pipe data stream transmission and reception management. * \copydetails Group_PipeStreamRW @@ -36,7 +36,7 @@ * dispatch header located in LUFA/Drivers/USB/USB.h. */ -/** \ingroup Group_PipeRW +/** \ingroup Group_PipeRW * \defgroup Group_PipeStreamRW Read/Write of Multi-Byte Streams * \brief Pipe data stream transmission and reception management. * @@ -52,7 +52,7 @@ /* Includes: */ #include "../../../Common/Common.h" #include "USBMode.h" - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { @@ -62,17 +62,17 @@ #if !defined(__INCLUDE_FROM_USB_DRIVER) #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead. #endif - + /* Public Interface - May be used in end-application: */ /* Enums: */ /** Enum for the possible error return codes of the Pipe_*_Stream_* functions. */ enum Pipe_Stream_RW_ErrorCodes_t { PIPE_RWSTREAM_NoError = 0, /**< Command completed successfully, no error. */ - PIPE_RWSTREAM_PipeStalled = 1, /**< The device stalled the pipe during the transfer. */ + PIPE_RWSTREAM_PipeStalled = 1, /**< The device stalled the pipe during the transfer. */ PIPE_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during * the transfer. - */ + */ PIPE_RWSTREAM_Timeout = 3, /**< The device failed to accept or send the next packet * within the software timeout period set by the * \ref USB_STREAM_TIMEOUT_MS macro. @@ -93,7 +93,7 @@ #if defined(__cplusplus) } #endif - + #endif /** @} */ diff --git a/LUFA/Drivers/USB/Core/StdDescriptors.h b/LUFA/Drivers/USB/Core/StdDescriptors.h index f5bacf804..6bece18a1 100644 --- a/LUFA/Drivers/USB/Core/StdDescriptors.h +++ b/LUFA/Drivers/USB/Core/StdDescriptors.h @@ -123,7 +123,7 @@ */ #define USB_CONFIG_ATTR_REMOTEWAKEUP 0x20 //@} - + /** \name Endpoint Descriptor Attribute Masks */ //@{ /** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's @@ -154,7 +154,7 @@ */ #define ENDPOINT_ATTR_SYNC (3 << 2) //@} - + /** \name Endpoint Descriptor Usage Masks */ //@{ /** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's @@ -178,7 +178,7 @@ */ #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4) //@} - + /* Enums: */ /** Enum for the possible standard descriptor types, as given in each descriptor's header. */ enum USB_DescriptorTypes_t diff --git a/LUFA/Drivers/USB/Core/StdRequestType.h b/LUFA/Drivers/USB/Core/StdRequestType.h index e5cadfe6e..47d6ae1d7 100644 --- a/LUFA/Drivers/USB/Core/StdRequestType.h +++ b/LUFA/Drivers/USB/Core/StdRequestType.h @@ -51,7 +51,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) @@ -219,7 +219,7 @@ * via the \ref EVENT_USB_Device_ControlRequest() event when received in * device mode. */ }; - + /** Feature Selector values for Set Feature and Clear Feature standard control requests directed to the device, interface * and endpoint recipients. */ diff --git a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h index a26d7c2da..e79c3b093 100644 --- a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h @@ -54,7 +54,7 @@ #include "../StdDescriptors.h" #include "../USBInterrupt.h" #include "../Endpoint.h" - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { @@ -81,15 +81,15 @@ * USB interface should be initialized in full speed (12Mb/s) mode. */ #define USB_DEVICE_OPT_FULLSPEED (0 << 0) - + #if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || defined(__DOXYGEN__) /** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the * USB interface should be initialized in high speed (480Mb/s) mode. */ - #define USB_DEVICE_OPT_HIGHSPEED (1 << 1) + #define USB_DEVICE_OPT_HIGHSPEED (1 << 1) #endif //@} - + #if (!defined(NO_INTERNAL_SERIAL) && \ (defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || \ defined(__DOXYGEN__))) @@ -103,7 +103,7 @@ * number for the device. */ #define USE_INTERNAL_SERIAL 0xDC - + /** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller * model. */ @@ -119,7 +119,7 @@ #define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_START_ADDRESS 0 #endif - + /* Function Prototypes: */ /** Sends a Remote Wakeup request to the host. This signals to the host that the device should * be taken out of suspended mode, and communications should resume. @@ -225,7 +225,7 @@ { uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + uint8_t* SigReadAddress = (uint8_t*)INTERNAL_SERIAL_START_ADDRESS; for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++) @@ -243,7 +243,7 @@ UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ? (('A' - 10) + SerialByte) : ('0' + SerialByte)); } - + SetGlobalInterruptMask(CurrentGlobalInt); } #endif diff --git a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c index 143708772..2bf143d37 100644 --- a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c @@ -228,3 +228,4 @@ uint8_t Endpoint_Null_Stream(uint16_t Length, #include "Template/Template_Endpoint_Control_R.c"
#endif + diff --git a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c index c8e3af72a..0509494f3 100644 --- a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c @@ -61,7 +61,7 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, uint32_t UECFG0Temp; Endpoint_SelectEndpoint(EPNum); - + if (EPNum == Number) { UECFG0Temp = UECFG0Data; @@ -79,11 +79,11 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, Endpoint_EnableEndpoint(); (&AVR32_USBB.uecfg0)[EPNum] = UECFG0Temp; - + if (!(Endpoint_IsConfigured())) - return false; + return false; } - + Endpoint_SelectEndpoint(Number); return true; #endif @@ -148,7 +148,7 @@ uint8_t Endpoint_WaitUntilReady(void) if (Endpoint_IsOUTReceived()) return ENDPOINT_READYWAIT_NoError; } - + uint8_t USB_DeviceState_LCL = USB_DeviceState; if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) diff --git a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h index 0e316c880..85f04afb1 100644 --- a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h @@ -119,7 +119,7 @@ #define ENDPOINT_DETAILS_EP5 512, 3 #define ENDPOINT_DETAILS_EP6 512, 3 #define ENDPOINT_DETAILS_EP7 512, 3 - #elif defined(USB_SERIES_UC3B0_AVR32) || defined(USB_SERIES_UC3B1_AVR32) + #elif defined(USB_SERIES_UC3B0_AVR32) || defined(USB_SERIES_UC3B1_AVR32) #define ENDPOINT_DETAILS_MAXEP 7 #define ENDPOINT_DETAILS_EP0 64, 1 @@ -154,14 +154,14 @@ void Endpoint_ClearEndpoints(void); bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, const uint32_t UECFGXData); - + /* External Variables: */ extern volatile uint32_t USB_Endpoint_SelectedEndpoint; extern volatile uint8_t* USB_Endpoint_FIFOPos[]; #endif /* Public Interface - May be used in end-application: */ - /* Macros: */ + /* Macros: */ /** \name Endpoint Bank Mode Masks */ //@{ /** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates @@ -302,7 +302,7 @@ const uint8_t Banks) { return Endpoint_ConfigureEndpoint_Prv(Number, (AVR32_USBB_ALLOC_MASK | - ((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) | + ((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) | ((uint32_t)(Direction ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) | ((uint32_t)Banks << AVR32_USBB_EPBK_OFFSET) | Endpoint_BytesToEPSizeMask(Size)))); @@ -422,7 +422,7 @@ while ((&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].killbk); } } - + /** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint * bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN * direction). This function will return false if an error has occurred in the endpoint, if the endpoint diff --git a/LUFA/Drivers/USB/Core/UC3/Host_UC3.c b/LUFA/Drivers/USB/Core/UC3/Host_UC3.c index 55cd8f991..dde5b1b0f 100644 --- a/LUFA/Drivers/USB/Core/UC3/Host_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/Host_UC3.c @@ -254,7 +254,7 @@ static void USB_Host_ResetDevice(void) USB_Host_ResetBus(); while (!(USB_Host_IsBusResetComplete())); USB_Host_ResumeBus(); - + USB_Host_ConfigurationNumber = 0; bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI); diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c index eca6cb8aa..f447a1730 100644 --- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c @@ -69,7 +69,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number, uint32_t UPCFG0Temp; Pipe_SelectPipe(PNum); - + if (PNum == Number) { UPCFG0Temp = (AVR32_USBB_ALLOC_MASK | @@ -85,7 +85,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number, if (!(UPCFG0Temp & AVR32_USBB_ALLOC_MASK)) continue; - + Pipe_DisablePipe(); (&AVR32_USBB.upcfg0)[PNum] &= ~AVR32_USBB_ALLOC_MASK; @@ -93,12 +93,12 @@ bool Pipe_ConfigurePipe(const uint8_t Number, (&AVR32_USBB.upcfg0)[PNum] = UPCFG0Temp; Pipe_SetInfiniteINRequests(); - + if (!(Pipe_IsConfigured())) - return false; + return false; } - - Pipe_SelectPipe(Number); + + Pipe_SelectPipe(Number); return true; #endif } diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h index d99cfed96..a047198ce 100644 --- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h @@ -100,7 +100,7 @@ #if !defined(__DOXYGEN__) /* Macros: */ #define PIPE_HSB_ADDRESS_SPACE_SIZE (64 * 1024UL) - + /* External Variables: */ extern volatile uint32_t USB_Pipe_SelectedPipe; extern volatile uint8_t* USB_Pipe_FIFOPos[]; @@ -146,7 +146,7 @@ */ #define PIPE_TOKEN_OUT AVR32_USBB_UPCFG0_PTOKEN_OUT //@} - + /** \name Pipe Bank Mode Masks */ //@{ /** Mask for the bank mode selection for the \ref Pipe_ConfigurePipe() macro. This indicates that the pipe @@ -185,7 +185,7 @@ */ #define PIPE_TOTAL_PIPES 8 #else - #define PIPE_TOTAL_PIPES 7 + #define PIPE_TOTAL_PIPES 7 #endif /** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR @@ -446,7 +446,7 @@ static inline uint8_t Pipe_GetErrorFlags(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; static inline uint8_t Pipe_GetErrorFlags(void) { - + return (((&AVR32_USBB.uperr0)[USB_Pipe_SelectedPipe] & (PIPE_ERRORFLAG_CRC16 | PIPE_ERRORFLAG_TIMEOUT | PIPE_ERRORFLAG_PID | PIPE_ERRORFLAG_DATAPID | @@ -454,7 +454,7 @@ (((&AVR32_USBB.upsta0)[USB_Pipe_SelectedPipe] << 8) & PIPE_ERRORFLAG_OVERFLOW)); } - + /** Retrieves the number of busy banks in the currently selected pipe, which have been queued for * transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the * \ref Pipe_ClearIN() command. @@ -902,7 +902,7 @@ #if !defined(ENDPOINT_CONTROLEP) #define ENDPOINT_CONTROLEP 0 #endif - + /* Inline Functions: */ static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE; static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes) diff --git a/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c b/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c index 68f645b89..55d137ba3 100644 --- a/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c +++ b/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c @@ -81,3 +81,4 @@ uint8_t TEMPLATE_FUNC_NAME (void* const Buffer, #undef TEMPLATE_TRANSFER_BYTE #endif + diff --git a/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c index 5d4fc42f2..36685f0c4 100644 --- a/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c +++ b/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c @@ -90,3 +90,4 @@ uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer, #undef TEMPLATE_TRANSFER_BYTE #endif + diff --git a/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c b/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c index 46b006364..7ed192df7 100644 --- a/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c +++ b/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c @@ -86,3 +86,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer, #undef TEMPLATE_BUFFER_MOVE #endif + diff --git a/LUFA/Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c index bc8570d01..daba216ac 100644 --- a/LUFA/Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c +++ b/LUFA/Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c @@ -48,7 +48,7 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer, Length -= *BytesProcessed; TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed); } - + while (Length) { if (!(Pipe_IsReadWriteAllowed())) @@ -85,3 +85,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer, #undef TEMPLATE_BUFFER_MOVE #endif + diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c index 93ed03ecf..965971fc6 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c @@ -59,7 +59,7 @@ void USB_Init( #if !defined(USE_STATIC_OPTIONS) USB_Options = Options; #endif - + #if defined(USB_CAN_BE_BOTH) if (Mode == USB_MODE_UID) { @@ -73,7 +73,7 @@ void USB_Init( USB_CurrentMode = Mode; } #else - AVR32_USBB.USBCON.uide = false; + AVR32_USBB.USBCON.uide = false; #endif USB_IsInitialized = true; @@ -172,13 +172,13 @@ static void USB_Init_Device(void) else { #if defined(USB_DEVICE_OPT_HIGHSPEED) - if (USB_Options & USB_DEVICE_OPT_HIGHSPEED) + if (USB_Options & USB_DEVICE_OPT_HIGHSPEED) USB_Device_SetHighSpeed(); else USB_Device_SetFullSpeed(); #else USB_Device_SetFullSpeed(); - #endif + #endif } USB_INT_Enable(USB_INT_VBUSTI); diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h index 8ec5626d5..3f7ec5fbe 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h @@ -270,13 +270,13 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) - /* Macros: */ + /* Macros: */ #if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) #define USB_CLOCK_REQUIRED_FREQ 12000000UL #else #define USB_CLOCK_REQUIRED_FREQ 48000000UL #endif - + /* Function Prototypes: */ #if defined(__INCLUDE_FROM_USB_CONTROLLER_C) #if defined(USB_CAN_BE_DEVICE) diff --git a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h index c4276d9c1..bf6d172a2 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h @@ -58,7 +58,7 @@ #if !defined(__DOXYGEN__) /* External Variables: */ extern volatile uint32_t USB_Endpoint_SelectedEndpoint; - + /* Enums: */ enum USB_Interrupts_t { @@ -73,7 +73,7 @@ USB_INT_SOFI = 5, USB_INT_RXSTPI = 6, #endif - #if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)) + #if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)) USB_INT_HSOFI = 7, USB_INT_DCONNI = 8, USB_INT_DDISCI = 9, @@ -82,11 +82,11 @@ USB_INT_VBERRI = 12, #endif }; - + /* Inline Functions: */ static inline void USB_INT_Enable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Enable(const uint8_t Interrupt) - { + { switch (Interrupt) { case USB_INT_VBUSTI: @@ -189,7 +189,7 @@ #endif } } - + static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Clear(const uint8_t Interrupt) { @@ -254,7 +254,7 @@ #endif } } - + static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) { @@ -278,7 +278,7 @@ case USB_INT_RXSTPI: return (&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].rxstpe; #endif - #if defined(USB_CAN_BE_HOST) + #if defined(USB_CAN_BE_HOST) case USB_INT_HSOFI: return AVR32_USBB.UHINTE.hsofie; case USB_INT_DCONNI: @@ -293,10 +293,10 @@ return AVR32_USBB.USBCON.vberre; #endif } - + return false; } - + static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) { @@ -360,7 +360,7 @@ #else ISR(USB_GEN_vect); #endif - + /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) } diff --git a/LUFA/Drivers/USB/Core/USBController.h b/LUFA/Drivers/USB/Core/USBController.h index 1c44c1676..1e4f326d0 100644 --- a/LUFA/Drivers/USB/Core/USBController.h +++ b/LUFA/Drivers/USB/Core/USBController.h @@ -50,7 +50,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) @@ -119,7 +119,7 @@ #elif (ARCH == ARCH_UC3) #include "UC3/USBController_UC3.h" #elif (ARCH == ARCH_XMEGA) - #include "XMEGA/USBController_XMEGA.h" + #include "XMEGA/USBController_XMEGA.h" #endif /* Disable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/USB/Core/USBInterrupt.h b/LUFA/Drivers/USB/Core/USBInterrupt.h index f0b3181c7..3f88071a1 100644 --- a/LUFA/Drivers/USB/Core/USBInterrupt.h +++ b/LUFA/Drivers/USB/Core/USBInterrupt.h @@ -43,7 +43,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) @@ -61,7 +61,7 @@ #elif (ARCH == ARCH_UC3) #include "UC3/USBInterrupt_UC3.h" #elif (ARCH == ARCH_XMEGA) - #include "XMEGA/USBInterrupt_XMEGA.h" + #include "XMEGA/USBInterrupt_XMEGA.h" #endif /* Disable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h index debdc2d88..00130778e 100644 --- a/LUFA/Drivers/USB/Core/USBMode.h +++ b/LUFA/Drivers/USB/Core/USBMode.h @@ -91,7 +91,7 @@ * (i.e. AT32UC3A0*) when defined. */ #define USB_SERIES_UC3A0_AVR - + /** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A1 Series USB controller * (i.e. AT32UC3A1*) when defined. */ @@ -111,7 +111,7 @@ * (i.e. AT32UC3B1*) when defined. */ #define USB_SERIES_UC3B1_AVR - + /** Indicates that the target AVR microcontroller belongs to the XMEGA A1U Series USB controller * (i.e. ATXMEGA*A1U) when defined. */ @@ -219,7 +219,7 @@ #define USB_SERIES_B3_XMEGA #define USB_CAN_BE_DEVICE #endif - + #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST)) #define USB_CAN_BE_BOTH #endif @@ -241,7 +241,7 @@ #undef USB_CAN_BE_BOTH #endif #endif - + #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY)) #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive. #endif @@ -259,3 +259,4 @@ #endif /** @} */ + diff --git a/LUFA/Drivers/USB/Core/USBTask.h b/LUFA/Drivers/USB/Core/USBTask.h index 6084268de..53eb719f7 100644 --- a/LUFA/Drivers/USB/Core/USBTask.h +++ b/LUFA/Drivers/USB/Core/USBTask.h @@ -43,7 +43,7 @@ /* Includes: */ #include "../../../Common/Common.h" - #include "USBMode.h" + #include "USBMode.h" #include "USBController.h" #include "Events.h" #include "StdRequestType.h" @@ -81,7 +81,7 @@ extern volatile bool USB_IsInitialized; /** Structure containing the last received Control request when in Device mode (for use in user-applications - * inside of the \ref EVENT_USB_Device_ControlRequest() event, or for filling up with a control request to + * inside of the \ref EVENT_USB_Device_ControlRequest() event, or for filling up with a control request to * issue when in Host mode before calling \ref USB_Host_SendControlRequest(). * * \note The contents of this structure is automatically endian-corrected for the current CPU architecture. diff --git a/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h index 91cc59517..8fefbcb65 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h +++ b/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h @@ -54,7 +54,7 @@ #include "../StdDescriptors.h" #include "../USBInterrupt.h" #include "../Endpoint.h" - + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { @@ -97,7 +97,7 @@ */ #define USB_DEVICE_OPT_FULLSPEED (0 << 0) //@} - + #if (!defined(NO_INTERNAL_SERIAL) || defined(__DOXYGEN__)) /** String descriptor index for the device's unique serial number string descriptor within the device. * This unique serial number is used by the host to associate resources to the device (such as drivers or COM port @@ -114,7 +114,7 @@ * model. */ #define INTERNAL_SERIAL_LENGTH_BITS (8 * (1 + (offsetof(NVM_PROD_SIGNATURES_t, COORDY1) - offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0)))) - + /** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller * model. */ @@ -125,7 +125,7 @@ #define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_START_ADDRESS 0 #endif - + /* Function Prototypes: */ /** Sends a Remote Wakeup request to the host. This signals to the host that the device should * be taken out of suspended mode, and communications should resume. @@ -211,17 +211,17 @@ { return ((USB.ADDR != 0) ? true : false); } - + static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1); static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) { uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS; for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++) - { + { uint8_t SerialByte; NVM.CMD = NVM_CMD_READ_CALIB_ROW_gc; @@ -239,7 +239,7 @@ UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ? (('A' - 10) + SerialByte) : ('0' + SerialByte)); } - + SetGlobalInterruptMask(CurrentGlobalInt); } diff --git a/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c index 15ee479cb..feaffd630 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c +++ b/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c @@ -268,3 +268,4 @@ uint8_t Endpoint_Null_Stream(uint16_t Length, #endif
#endif + diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c index c301cc385..e73781466 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c +++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c @@ -51,13 +51,13 @@ bool Endpoint_ConfigureEndpoint_PRV(const uint8_t Number, const uint8_t Size) { Endpoint_SelectEndpoint(Number | Direction); - + USB_Endpoint_SelectedHandle->CTRL = 0; USB_Endpoint_SelectedHandle->STATUS = (Direction == ENDPOINT_DIR_IN) ? USB_EP_BUSNACK0_bm : 0; USB_Endpoint_SelectedHandle->CTRL = Config; USB_Endpoint_SelectedHandle->CNT = 0; USB_Endpoint_SelectedHandle->DATAPTR = (intptr_t)USB_Endpoint_SelectedFIFO->Data; - + USB_Endpoint_SelectedFIFO->Length = (Direction == ENDPOINT_DIR_IN) ? Size : 0; USB_Endpoint_SelectedFIFO->Position = 0; @@ -117,7 +117,7 @@ uint8_t Endpoint_WaitUntilReady(void) if (Endpoint_IsOUTReceived()) return ENDPOINT_READYWAIT_NoError; } - + uint8_t USB_DeviceState_LCL = USB_DeviceState; if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h index 2d4d7be93..495aa9707 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h +++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h @@ -104,7 +104,7 @@ uint8_t Length; uint8_t Position; } Endpoint_FIFO_t; - + typedef struct { Endpoint_FIFO_t OUT; @@ -143,7 +143,7 @@ #endif /* Public Interface - May be used in end-application: */ - /* Macros: */ + /* Macros: */ /** \name Endpoint Bank Mode Masks */ //@{ /** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates @@ -234,7 +234,7 @@ static inline void Endpoint_SelectEndpoint(const uint8_t EndpointNumber) { USB_Endpoint_SelectedEndpoint = EndpointNumber; - + if (EndpointNumber & ENDPOINT_DIR_IN) { USB_Endpoint_SelectedFIFO = &USB_Endpoint_FIFOs[EndpointNumber & ENDPOINT_EPNUM_MASK].IN; @@ -290,7 +290,7 @@ const uint8_t Banks) { uint8_t EPConfigMask = (USB_EP_INTDSBL_bm | Banks | Endpoint_BytesToEPSizeMask(Size)); - + // TODO - Fix once limitations are lifted if ((Banks != ENDPOINT_BANK_SINGLE) || (Size > 64)) return false; @@ -307,10 +307,10 @@ EPConfigMask |= USB_EP_TYPE_BULK_gc; break; } - + if (Type == EP_TYPE_CONTROL) Endpoint_ConfigureEndpoint_PRV(Number, (Direction ^ ENDPOINT_DIR_IN), EPConfigMask, Size); - + return Endpoint_ConfigureEndpoint_PRV(Number, Direction, EPConfigMask, Size); } @@ -439,7 +439,7 @@ static inline bool Endpoint_IsINReady(void) { Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint | ENDPOINT_DIR_IN); - + return ((USB_Endpoint_SelectedHandle->STATUS & USB_EP_BUSNACK0_bm) ? true : false); } @@ -459,7 +459,7 @@ USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT; return true; } - + return false; } @@ -479,7 +479,7 @@ USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT; return true; } - + return false; } @@ -523,7 +523,7 @@ */ static inline void Endpoint_ClearOUT(void) ATTR_ALWAYS_INLINE; static inline void Endpoint_ClearOUT(void) - { + { USB_Endpoint_SelectedHandle->STATUS &= ~(USB_EP_TRNCOMPL0_bm | USB_EP_BUSNACK0_bm | USB_EP_OVF_bm); USB_Endpoint_SelectedFIFO->Position = 0; } @@ -543,7 +543,7 @@ static inline void Endpoint_StallTransaction(void) { USB_Endpoint_SelectedHandle->CTRL |= USB_EP_STALL_bm; - + if ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_TYPE_gm) == USB_EP_TYPE_CONTROL_gc) { Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint ^ ENDPOINT_DIR_IN); @@ -636,7 +636,7 @@ { uint16_t Byte0 = Endpoint_Read_8(); uint16_t Byte1 = Endpoint_Read_8(); - + return ((Byte1 << 8) | Byte0); } @@ -652,7 +652,7 @@ { uint16_t Byte0 = Endpoint_Read_8(); uint16_t Byte1 = Endpoint_Read_8(); - + return ((Byte0 << 8) | Byte1); } @@ -709,7 +709,7 @@ uint32_t Byte1 = Endpoint_Read_8(); uint32_t Byte2 = Endpoint_Read_8(); uint32_t Byte3 = Endpoint_Read_8(); - + return ((Byte3 << 24) | (Byte2 << 16) | (Byte1 << 8) | Byte0); } @@ -727,7 +727,7 @@ uint32_t Byte1 = Endpoint_Read_8(); uint32_t Byte2 = Endpoint_Read_8(); uint32_t Byte3 = Endpoint_Read_8(); - + return ((Byte0 << 24) | (Byte1 << 16) | (Byte2 << 8) | Byte3); } diff --git a/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c index 4144a06c5..b9d9d7699 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c +++ b/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c @@ -1,7 +1,7 @@ /* LUFA Library Copyright (C) Dean Camera, 2011. - + dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ @@ -9,13 +9,13 @@ /* Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in + without fee, provided that the above copyright notice appear in all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this diff --git a/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c b/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c index 68f645b89..55d137ba3 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c +++ b/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c @@ -81,3 +81,4 @@ uint8_t TEMPLATE_FUNC_NAME (void* const Buffer, #undef TEMPLATE_TRANSFER_BYTE #endif + diff --git a/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c index 5d4fc42f2..36685f0c4 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c +++ b/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c @@ -90,3 +90,4 @@ uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer, #undef TEMPLATE_TRANSFER_BYTE #endif + diff --git a/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c b/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c index 46b006364..7ed192df7 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c +++ b/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c @@ -86,3 +86,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer, #undef TEMPLATE_BUFFER_MOVE #endif + diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c index 3b7793020..1d678fb20 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c +++ b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c @@ -61,9 +61,9 @@ void USB_Init( #if !defined(USE_STATIC_OPTIONS) USB_Options = Options; #endif - + USB_IsInitialized = true; - + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); @@ -71,7 +71,7 @@ void USB_Init( USB.CAL0 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL0)); USB.CAL1 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL1)); NVM.CMD = 0; - + USB.EPPTR = (intptr_t)&USB_EndpointTable; USB.CTRLA = (USB_STFRNUM_bm | USB_MAXEP_gm); @@ -95,7 +95,7 @@ void USB_Disable(void) USB_Detach(); USB_Controller_Disable(); - USB_IsInitialized = false; + USB_IsInitialized = false; } void USB_ResetInterface(void) @@ -104,14 +104,14 @@ void USB_ResetInterface(void) CLK.USBCTRL = (((F_USB / 6000000) - 1) << CLK_USBPSDIV_gp); else CLK.USBCTRL = (((F_USB / 48000000) - 1) << CLK_USBPSDIV_gp); - + if (USB_Options & USB_OPT_PLLCLKSRC) CLK.USBCTRL |= (CLK_USBSRC_PLL_gc | CLK_USBSEN_bm); else CLK.USBCTRL |= (CLK_USBSRC_RC32M_gc | CLK_USBSEN_bm); USB_Device_SetDeviceAddress(0); - + USB_INT_DisableAllInterrupts(); USB_INT_ClearAllInterrupts(); @@ -135,7 +135,7 @@ static void USB_Init_Device(void) #if !defined(FIXED_CONTROL_ENDPOINT_SIZE) USB_Descriptor_Device_t* DeviceDescriptorPtr; - + #if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \ !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)) uint8_t DescriptorAddressSpace; @@ -159,7 +159,7 @@ static void USB_Init_Device(void) #else USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size); #endif - } + } #endif #endif @@ -177,3 +177,4 @@ static void USB_Init_Device(void) USB_Attach(); } #endif + diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h index 2c3169758..77d422a8b 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h +++ b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h @@ -67,12 +67,12 @@ } Endpoints[16]; uint16_t FrameNum; } ATTR_PACKED USB_EndpointTable_t; - + /* External Variables: */ extern USB_EndpointTable_t USB_EndpointTable; - + #endif - + /* Includes: */ #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__) #include "../Device.h" @@ -94,7 +94,7 @@ #if !defined(F_USB) #error F_USB is not defined. You must define F_USB to the frequency of the unprescaled USB controller clock in your project makefile. #endif - + #if (F_USB % 6000000) #error Invalid F_USB specified. F_USB must be a multiple of 6MHz for USB Low Speed operation, and a multiple of 48MHz for Full Speed operation. #endif diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c index 62fbf2d91..2dce0e64c 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c +++ b/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c @@ -70,7 +70,7 @@ ISR(USB_BUSEVENT_vect) if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Resume)) { USB_INT_Clear(USB_INT_BUSEVENTI_Resume); - + if (USB_Device_ConfigurationNumber) USB_DeviceState = DEVICE_STATE_Configured; else @@ -86,7 +86,7 @@ ISR(USB_BUSEVENT_vect) if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Reset)) { USB_INT_Clear(USB_INT_BUSEVENTI_Reset); - + USB_DeviceState = DEVICE_STATE_Default; USB_Device_ConfigurationNumber = 0; diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h index f27ea6022..c2436cae6 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h +++ b/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h @@ -76,8 +76,8 @@ USB.INTCTRLA |= USB_BUSEVIE_bm; return; case USB_INT_SOFI: - USB.INTCTRLA |= USB_SOFIE_bm; - return; + USB.INTCTRLA |= USB_SOFIE_bm; + return; } } @@ -90,11 +90,11 @@ USB.INTCTRLA &= ~USB_BUSEVIE_bm; return; case USB_INT_SOFI: - USB.INTCTRLA &= ~USB_SOFIE_bm; - return; + USB.INTCTRLA &= ~USB_SOFIE_bm; + return; } } - + static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Clear(const uint8_t Interrupt) { @@ -110,11 +110,11 @@ USB.INTFLAGSACLR = USB_RSTIF_bm; return; case USB_INT_SOFI: - USB.INTFLAGSACLR = USB_SOFIF_bm; - return; + USB.INTFLAGSACLR = USB_SOFIF_bm; + return; } } - + static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) { @@ -125,10 +125,10 @@ case USB_INT_SOFI: return ((USB.INTCTRLA & USB_SOFIE_bm) ? true : false); } - + return false; } - + static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) { @@ -143,7 +143,7 @@ case USB_INT_SOFI: return ((USB.INTFLAGSACLR & USB_SOFIF_bm) ? true : false); } - + return false; } diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h index 75255297b..b63333626 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -392,7 +392,7 @@ #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__) #include "Core/OTG.h" #endif - + #include "Class/AndroidAccessoryClass.h" #include "Class/AudioClass.h" #include "Class/CDCClass.h" diff --git a/LUFA/Platform/UC3/ClockManagement.h b/LUFA/Platform/UC3/ClockManagement.h index bb5679ad9..ef2a1b56e 100644 --- a/LUFA/Platform/UC3/ClockManagement.h +++ b/LUFA/Platform/UC3/ClockManagement.h @@ -55,7 +55,7 @@ * { * // Start the master external oscillator which will be used as the main clock reference * AVR32CLK_StartExternalOscillator(0, EXOSC_MODE_8MHZ_OR_MORE, EXOSC_START_0CLK); - * + * * // Start the PLL for the CPU clock, switch CPU to it * AVR32CLK_StartPLL(0, CLOCK_SRC_OSC0, 12000000, F_CPU); * AVR32CLK_SetCPUClockSource(CLOCK_SRC_PLL0, F_CPU); @@ -88,7 +88,7 @@ EXOSC_MODE_900KHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G0, /**< External crystal oscillator equal to or slower than 900KHz. */ EXOSC_MODE_3MHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G1, /**< External crystal oscillator equal to or slower than 3MHz. */ EXOSC_MODE_8MHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G2, /**< External crystal oscillator equal to or slower than 8MHz. */ - EXOSC_MODE_8MHZ_OR_MORE = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G3, /**< External crystal oscillator equal to or faster than 8MHz. */ + EXOSC_MODE_8MHZ_OR_MORE = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G3, /**< External crystal oscillator equal to or faster than 8MHz. */ }; /** Enum for the possible external oscillator statup times. */ @@ -102,7 +102,7 @@ EXOSC_START_8192CLK = AVR32_PM_OSCCTRL0_STARTUP_8192_RCOSC, /**< Wait 8192 clock cyles before startup for stability. */ EXOSC_START_16384CLK = AVR32_PM_OSCCTRL0_STARTUP_16384_RCOSC, /**< Wait 16384 clock cyles before startup for stability. */ }; - + /** Enum for the possible module clock sources. */ enum UC3_System_ClockSource_t { @@ -182,7 +182,7 @@ { if (SourceFreq > Frequency) return false; - + switch (Source) { case CLOCK_SRC_OSC0: @@ -212,7 +212,7 @@ { AVR32_PM.PLL[Channel].pllen = false; } - + /** Starts the given Generic Clock of the UC3 microcontroller, with the given options. * * \param[in] Channel Index of the Generic Clock to start. @@ -252,17 +252,17 @@ default: return false; } - + if (SourceFreq < Frequency) return false; AVR32_PM.GCCTRL[Channel].diven = (SourceFreq > Frequency) ? true : false; AVR32_PM.GCCTRL[Channel].div = (((SourceFreq / Frequency) - 1) / 2); AVR32_PM.GCCTRL[Channel].cen = true; - + return true; } - + /** Stops the given generic clock of the UC3 microcontroller. * * \param[in] Channel Index of the generic clock to stop. @@ -272,7 +272,7 @@ { AVR32_PM.GCCTRL[Channel].cen = false; } - + /** Sets the clock source for the main microcontroller core. The given clock source should be configured * and ready for use before this function is called. * @@ -310,7 +310,7 @@ default: return false; } - + return true; } @@ -322,3 +322,4 @@ #endif /** @} */ + diff --git a/LUFA/Platform/UC3/InterruptManagement.c b/LUFA/Platform/UC3/InterruptManagement.c index 98d1e45f5..ce2a8199c 100644 --- a/LUFA/Platform/UC3/InterruptManagement.c +++ b/LUFA/Platform/UC3/InterruptManagement.c @@ -60,3 +60,4 @@ void INTC_Init(void) __builtin_mtsr(AVR32_EVBA, (uintptr_t)&EVBA_Table); } + diff --git a/LUFA/Platform/UC3/InterruptManagement.h b/LUFA/Platform/UC3/InterruptManagement.h index dd70675c3..6bd7f0ad4 100644 --- a/LUFA/Platform/UC3/InterruptManagement.h +++ b/LUFA/Platform/UC3/InterruptManagement.h @@ -137,7 +137,7 @@ InterruptHandlers[GroupNumber] = Handler; AVR32_INTC.ipr[GroupNumber] = Autovector_Table[InterruptLevel]; } - + /** Retrieves the pending interrupts for a given interrupt group. The result of this function should be masked * against interrupt request indexes converted to a request line number via the \ref INTC_IRQ_LINE() macro. To * obtain the group number of a given interrupt request, use the \ref INTC_IRQ_GROUP() macro. @@ -151,7 +151,7 @@ { return AVR32_INTC.irr[GroupNumber]; } - + /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) } @@ -160,3 +160,4 @@ #endif /** @} */ + diff --git a/LUFA/Platform/XMEGA/ClockManagement.h b/LUFA/Platform/XMEGA/ClockManagement.h index 1305d0e4b..20606a116 100644 --- a/LUFA/Platform/XMEGA/ClockManagement.h +++ b/LUFA/Platform/XMEGA/ClockManagement.h @@ -50,13 +50,13 @@ * Usage Example: * \code * #include <LUFA/Platform/XMEGA/ClockManagement.h> - * + * * void main(void) * { * // Start the PLL to multiply the 2MHz RC oscillator to 32MHz and switch the CPU core to run from it * XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, 32000000); * XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL, F_CPU); - * + * * // Start the 32MHz internal RC oscillator and start the DFLL to increase it to 48MHz using the USB SOF as a reference * XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ); * XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, 48000000); @@ -85,7 +85,7 @@ EXOSC_FREQ_2MHZ_MAX = OSC_FRQRANGE_04TO2_gc, /**< External crystal oscillator equal to or slower than 2MHz. */ EXOSC_FREQ_9MHZ_MAX = OSC_FRQRANGE_2TO9_gc, /**< External crystal oscillator equal to or slower than 9MHz. */ EXOSC_FREQ_12MHZ_MAX = OSC_FRQRANGE_9TO12_gc, /**< External crystal oscillator equal to or slower than 12MHz. */ - EXOSC_FREQ_16MHZ_MAX = OSC_FRQRANGE_12TO16_gc, /**< External crystal oscillator equal to or slower than 16MHz. */ + EXOSC_FREQ_16MHZ_MAX = OSC_FRQRANGE_12TO16_gc, /**< External crystal oscillator equal to or slower than 16MHz. */ }; /** Enum for the possible external oscillator statup times. */ @@ -97,7 +97,7 @@ EXOSC_START_1KCLK = OSC_XOSCSEL_XTAL_1KCLK_gc, /**< Wait 1K clock cycles before startup. */ EXOSC_START_16KCLK = OSC_XOSCSEL_XTAL_16KCLK_gc, /**< Wait 16K clock cycles before startup. */ }; - + /** Enum for the possible module clock sources. */ enum XMEGA_System_ClockSource_t { @@ -132,8 +132,8 @@ { OSC.XOSCCTRL = (FreqRange | ((Startup == EXOSC_START_32KCLK) ? OSC_X32KLPM_bm : 0) | Startup); OSC.CTRL |= OSC_XOSCEN_bm; - - while (!(OSC.STATUS & OSC_XOSCRDY_bm)); + + while (!(OSC.STATUS & OSC_XOSCRDY_bm)); return true; } @@ -162,14 +162,14 @@ return true; case CLOCK_SRC_INT_RC32MHZ: OSC.CTRL |= OSC_RC32MEN_bm; - while (!(OSC.STATUS & OSC_RC32MRDY_bm)); + while (!(OSC.STATUS & OSC_RC32MRDY_bm)); return true; case CLOCK_SRC_INT_RC32KHZ: OSC.CTRL |= OSC_RC32KEN_bm; - while (!(OSC.STATUS & OSC_RC32KRDY_bm)); + while (!(OSC.STATUS & OSC_RC32KRDY_bm)); return true; } - + return false; } @@ -178,7 +178,7 @@ * \param[in] Source Internal oscillator to stop, a value from \ref XMEGA_System_ClockSource_t. * * \return Boolean \c true if the internal oscillator was successfully stopped, \c false if invalid parameters specified. - */ + */ static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source) ATTR_ALWAYS_INLINE; static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source) { @@ -194,7 +194,7 @@ OSC.CTRL &= ~OSC_RC32KEN_bm; return true; } - + return false; } @@ -216,10 +216,10 @@ const uint32_t Frequency) { uint8_t MulFactor = (Frequency / SourceFreq); - + if (SourceFreq > Frequency) - return false; - + return false; + switch (Source) { case CLOCK_SRC_INT_RC2MHZ: @@ -236,7 +236,7 @@ } OSC.CTRL |= OSC_PLLEN_bm; - + while (!(OSC.STATUS & OSC_PLLRDY_bm)); return true; } @@ -247,7 +247,7 @@ { OSC.CTRL &= ~OSC_PLLEN_bm; } - + /** Starts the DFLL of the XMEGA microcontroller, with the given options. * * \param[in] Source RC Clock source for the DFLL, a value from \ref XMEGA_System_ClockSource_t. @@ -264,7 +264,7 @@ const uint32_t Frequency) { uint16_t DFLLCompare = (Frequency / 1000); - + switch (Source) { case CLOCK_SRC_INT_RC2MHZ: @@ -291,7 +291,7 @@ default: return false; } - + return true; } @@ -315,7 +315,7 @@ default: return false; } - + return true; } @@ -333,7 +333,7 @@ const uint32_t SourceFreq) { uint8_t ClockSourceMask = 0; - + switch (Source) { case CLOCK_SRC_INT_RC2MHZ: @@ -354,16 +354,16 @@ default: return false; } - + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); CCP = CCP_IOREG_gc; CLK_CTRL = ClockSourceMask; - + SetGlobalInterruptMask(CurrentGlobalInt); - - Delay_MS(1); + + Delay_MS(1); return (CLK.CTRL == ClockSourceMask); } @@ -375,3 +375,4 @@ #endif /** @} */ + |