From cf4575b94a3c65e6535a159fc71fc885aebc2620 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 2 Aug 2019 14:02:40 -0700 Subject: Fix the LUFA lib to use a submodule instead of just files (#6245) * Remove LUFA files * Update descriptions for newer version of LUFA * Create PR6245.md * Fix CDC(Serial) type errors * Fix missed merge conflict for AUDIO_DTYPE_CSInterface --- .../LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h | 83 ---------- .../LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h | 109 ------------- .../LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h | 181 --------------------- 3 files changed, 373 deletions(-) delete mode 100644 lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h delete mode 100644 lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h delete mode 100644 lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h (limited to 'lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED') diff --git a/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h b/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h deleted file mode 100644 index e48bd5836f..0000000000 --- a/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2017 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - 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 - 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 - software without specific, written prior permission. - - The author disclaims all warranties with regard to this - software, including all implied warranties of merchantability - and fitness. In no event shall the author be liable for any - special, indirect or consequential damages or any damages - whatsoever resulting from loss of use, data or profits, whether - in an action of contract, negligence or other tortious action, - arising out of or in connection with the use or performance of - this software. -*/ - -/** \file - * \brief Board specific information header for the Atmel XMEGA C3 Xplained. - * \copydetails Group_BoardInfo_C3_XPLAINED - * - * \note This file should not be included directly. It is automatically included as needed by the Board driver - * dispatch header located in LUFA/Drivers/Board/Board.h. - */ - -/** \ingroup Group_BoardInfo - * \defgroup Group_BoardInfo_C3_XPLAINED C3_XPLAINED - * \brief Board specific information header for the Atmel XMEGA C3 Xplained. - * - * Board specific information header for the Atmel XMEGA C3 Xplained. - * - * @{ - */ - -#ifndef __BOARD_C3_XPLAINED_H__ -#define __BOARD_C3_XPLAINED_H__ - - /* Includes: */ - #include "../../../../Common/Common.h" - #include "../../Buttons.h" - #include "../../Dataflash.h" - #include "../../LEDs.h" - - /* Enable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - extern "C" { - #endif - - /* Preprocessor Checks: */ - #if !defined(__INCLUDE_FROM_BOARD_H) - #error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead. - #endif - - /* Public Interface - May be used in end-application: */ - /* Macros: */ - /** Indicates the board has hardware Buttons mounted. */ - #define BOARD_HAS_BUTTONS - - /** Indicates the board has hardware LEDs mounted. */ - #define BOARD_HAS_LEDS - - /* Disable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - } - #endif - -#endif - -/** @} */ - diff --git a/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h b/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h deleted file mode 100644 index 1a8c1fc7e9..0000000000 --- a/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2017 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - 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 - 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 - software without specific, written prior permission. - - The author disclaims all warranties with regard to this - software, including all implied warranties of merchantability - and fitness. In no event shall the author be liable for any - special, indirect or consequential damages or any damages - whatsoever resulting from loss of use, data or profits, whether - in an action of contract, negligence or other tortious action, - arising out of or in connection with the use or performance of - this software. -*/ - -/** \file - * \brief Board specific Buttons driver header for the Atmel XMEGA C3 Xplained. - * \copydetails Group_Buttons_C3_XPLAINED - * - * \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_C3_XPLAINED C3_XPLAINED - * \brief Board specific Buttons driver header for the Atmel XMEGA C3 Xplained. - * - * Board specific Buttons driver header for the Atmel XMEGA C3 Xplained. - * - * - * - * - * - *
NameInfoActive LevelPort Pin
BUTTONS_BUTTON1SW0 ButtonLowPORTF.1
BUTTONS_BUTTON2SW1 ButtonLowPORTF.2
- * - * @{ - */ - -#ifndef __BUTTONS_C3_XPLAINED_H__ -#define __BUTTONS_C3_XPLAINED_H__ - - /* Includes: */ - #include - - /* Enable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - extern "C" { - #endif - - /* Preprocessor Checks: */ - #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 << 1) - - /** Button mask for the second button on the board. */ - #define BUTTONS_BUTTON2 (1 << 2) - - /* Inline Functions: */ - #if !defined(__DOXYGEN__) - static inline void Buttons_Init(void) - { - PORTF.OUTCLR = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2); - PORTF.PIN1CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm); - PORTF.PIN2CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm); - } - - static inline void Buttons_Disable(void) - { - PORTF.OUTCLR = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2); - PORTF.PIN1CTRL = 0; - PORTF.PIN2CTRL = 0; - } - - static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - static inline uint8_t Buttons_GetStatus(void) - { - return (PORTF_IN & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)); - } - #endif - - /* Disable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - } - #endif - -#endif - -/** @} */ - diff --git a/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h b/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h deleted file mode 100644 index f701c883e1..0000000000 --- a/lib/lufa/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h +++ /dev/null @@ -1,181 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2017 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - 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 - 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 - software without specific, written prior permission. - - The author disclaims all warranties with regard to this - software, including all implied warranties of merchantability - and fitness. In no event shall the author be liable for any - special, indirect or consequential damages or any damages - whatsoever resulting from loss of use, data or profits, whether - in an action of contract, negligence or other tortious action, - arising out of or in connection with the use or performance of - this software. -*/ - -/** \file - * \brief Board specific LED driver header for the Atmel XMEGA C3 Xplained. - * \copydetails Group_LEDs_C3_XPLAINED - * - * \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_C3_XPLAINED C3_XPLAINED - * \brief Board specific LED driver header for the Atmel XMEGA C3 Xplained. - * - * Board specific LED driver header for the Atmel XMEGA C3 Xplained. - * - * - * - * - * - * - * - *
NameColorInfoActive LevelPort Pin
LEDS_LED1YellowLED0 LEDLowPORTR.0
LEDS_LED2YellowLED1 LEDLowPORTR.1
LEDS_LED3RedStatus Bicolour Red LEDLowPORTD.4
LEDS_LED4GreenStatus Bicolour Green LEDHighPORTD.5
- * - * @{ - */ - -#ifndef __LEDS_C3_XPLAINED_H__ -#define __LEDS_C3_XPLAINED_H__ - - /* Includes: */ - #include - - /* Enable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - extern "C" { - #endif - - /* Preprocessor Checks: */ - #if !defined(__INCLUDE_FROM_LEDS_H) - #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. - #endif - - /* Private Interface - For use in library only: */ - #if !defined(__DOXYGEN__) - /* Macros: */ - #define LEDS_PORTR_LEDS (LEDS_LED1 | LEDS_LED2) - #define LEDS_PORTD_LEDS (LEDS_LED3 | LEDS_LED4) - #endif - - /* Public Interface - May be used in end-application: */ - /* Macros: */ - /** LED mask for the first LED on the board. */ - #define LEDS_LED1 (1 << 0) - - /** LED mask for the second LED on the board. */ - #define LEDS_LED2 (1 << 1) - - /** LED mask for the third LED on the board. */ - #define LEDS_LED3 (1 << 4) - - /** LED mask for the fourth LED on the board. */ - #define LEDS_LED4 (1 << 5) - - /** LED mask for all the LEDs on the board. */ - #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4) - - /** LED mask for none of the board LEDs. */ - #define LEDS_NO_LEDS 0 - - /* Inline Functions: */ - #if !defined(__DOXYGEN__) - static inline void LEDs_Init(void) - { - PORTR.DIRSET = LEDS_PORTR_LEDS; - PORTR.OUTCLR = LEDS_PORTR_LEDS; - - PORTCFG.MPCMASK = LEDS_PORTR_LEDS; - PORTR.PIN0CTRL = PORT_INVEN_bm; - - PORTD.DIRSET = LEDS_PORTD_LEDS; - PORTD.OUTCLR = LEDS_PORTD_LEDS; - - PORTD.PIN4CTRL = PORT_INVEN_bm; - } - - static inline void LEDs_Disable(void) - { - PORTR.DIRCLR = LEDS_PORTR_LEDS; - PORTR.OUTCLR = LEDS_PORTR_LEDS; - - PORTCFG.MPCMASK = 0; - PORTR.PIN0CTRL = LEDS_PORTR_LEDS; - - PORTD.DIRCLR = LEDS_PORTD_LEDS; - PORTD.OUTCLR = LEDS_PORTD_LEDS; - - PORTD.PIN4CTRL = 0; - } - - static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) - { - PORTR_OUTSET = LEDMask & LEDS_PORTR_LEDS; - PORTD_OUTSET = LEDMask & LEDS_PORTD_LEDS; - } - - static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) - { - PORTR_OUTCLR = LEDMask & LEDS_PORTR_LEDS; - PORTD_OUTCLR = LEDMask & LEDS_PORTD_LEDS; - } - - static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) - { - PORTR_OUTCLR = LEDS_PORTR_LEDS; - PORTD_OUTCLR = LEDS_PORTD_LEDS; - - PORTR_OUTSET = (LEDMask & LEDS_PORTR_LEDS); - PORTD_OUTSET = (LEDMask & LEDS_PORTD_LEDS); - } - - static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, - const uint8_t ActiveMask) - { - PORTR_OUTCLR = (LEDMask & LEDS_PORTR_LEDS); - PORTD_OUTCLR = (LEDMask & LEDS_PORTD_LEDS); - - PORTR_OUTSET = (ActiveMask & LEDS_PORTR_LEDS); - PORTD_OUTSET = (ActiveMask & LEDS_PORTD_LEDS); - } - - static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) - { - PORTR_OUTTGL = (LEDMask & LEDS_PORTR_LEDS); - PORTD_OUTTGL = (LEDMask & LEDS_PORTD_LEDS); - } - - static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; - static inline uint8_t LEDs_GetLEDs(void) - { - return ((PORTR_OUT & LEDS_PORTR_LEDS) | (PORTD_OUT & LEDS_PORTD_LEDS)); - } - #endif - - /* Disable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - } - #endif - -#endif - -/** @} */ - -- cgit v1.2.3