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 --- .../MassStorage/BootloaderMassStorage.h | 99 ---------------------- 1 file changed, 99 deletions(-) delete mode 100644 lib/lufa/Bootloaders/MassStorage/BootloaderMassStorage.h (limited to 'lib/lufa/Bootloaders/MassStorage/BootloaderMassStorage.h') diff --git a/lib/lufa/Bootloaders/MassStorage/BootloaderMassStorage.h b/lib/lufa/Bootloaders/MassStorage/BootloaderMassStorage.h deleted file mode 100644 index c9ddee4d7f..0000000000 --- a/lib/lufa/Bootloaders/MassStorage/BootloaderMassStorage.h +++ /dev/null @@ -1,99 +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 - * - * Header file for BootloaderMassStorage.c. - */ - -#ifndef _BOOTLOADER_MASS_STORAGE_H_ -#define _BOOTLOADER_MASS_STORAGE_H_ - - /* Includes: */ - #include - #include - #include - #include - #include - - #include "Descriptors.h" - #include "Config/AppConfig.h" - - #include "Lib/SCSI.h" - - #include - #include - #include - - /* Preprocessor Checks: */ - #if !defined(__OPTIMIZE_SIZE__) - #error This bootloader requires that it be optimized for size, not speed, to fit into the target device. Change optimization settings and try again. - #endif - - /* Macros: */ - /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ - #define LEDMASK_USB_NOTREADY LEDS_LED1 - - /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */ - #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3) - - /** LED mask for the library LED driver, to indicate that the USB interface is ready. */ - #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4) - - /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */ - #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3) - - /** LED mask for the library LED driver, to indicate that the USB interface is busy. */ - #define LEDMASK_USB_BUSY LEDS_LED2 - - /** Magic bootloader key to unlock forced application start mode. */ - #define MAGIC_BOOT_KEY 0xDC42 - - /* Global Variables: */ - extern bool RunBootloader; - - /* Function Prototypes: */ - int main(void) AUX_BOOT_SECTION; - - void Application_Jump_Check(void) ATTR_INIT_SECTION(3); - - void EVENT_USB_Device_Connect(void) AUX_BOOT_SECTION; - void EVENT_USB_Device_Disconnect(void) AUX_BOOT_SECTION; - void EVENT_USB_Device_ConfigurationChanged(void) AUX_BOOT_SECTION; - void EVENT_USB_Device_ControlRequest(void) AUX_BOOT_SECTION; - - bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) AUX_BOOT_SECTION; - - #if defined(INCLUDE_FROM_BOOTLOADER_MASSSTORAGE_C) - static void SetupHardware(void) AUX_BOOT_SECTION; - #endif - -#endif - -- cgit v1.2.3