From 8858438a770c1c982f33b296447ca77176c751f7 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sun, 9 Jul 2017 21:26:51 -0400 Subject: Squashed 'lib/lufa/' changes from f2bd51f4e..bbdc9ac40 bbdc9ac40 Merge pull request #1 from fredizzimo/fix_line_endings 75ba27b8d Fix xml file line endings 7a8237259 Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b' 713c65b5b Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61' 00e20c453 delete old lufa git-subtree-dir: lib/lufa git-subtree-split: bbdc9ac40c2ff543bbaf3870d407d0a96c945c1a --- Bootloaders/CDC/asf.xml | 322 ++-- Bootloaders/DFU/asf.xml | 312 ++-- Bootloaders/HID/asf.xml | 246 +-- Bootloaders/MassStorage/BootloaderAPITable.S | 204 +-- Bootloaders/MassStorage/asf.xml | 312 ++-- Bootloaders/MassStorage/makefile | 150 +- Bootloaders/Printer/BootloaderAPITable.S | 182 +-- Bootloaders/Printer/asf.xml | 318 ++-- Bootloaders/Printer/makefile | 124 +- Demos/Device/ClassDriver/AudioInput/asf.xml | 104 +- Demos/Device/ClassDriver/AudioOutput/asf.xml | 100 +- Demos/Device/ClassDriver/DualVirtualSerial/asf.xml | 124 +- Demos/Device/ClassDriver/GenericHID/asf.xml | 126 +- Demos/Device/ClassDriver/Joystick/asf.xml | 124 +- Demos/Device/ClassDriver/Keyboard/asf.xml | 124 +- Demos/Device/ClassDriver/KeyboardMouse/asf.xml | 124 +- .../ClassDriver/KeyboardMouseMultiReport/asf.xml | 122 +- Demos/Device/ClassDriver/MIDI/asf.xml | 124 +- Demos/Device/ClassDriver/MassStorage/asf.xml | 134 +- .../Device/ClassDriver/MassStorageKeyboard/asf.xml | 140 +- Demos/Device/ClassDriver/Mouse/asf.xml | 124 +- Demos/Device/ClassDriver/RNDISEthernet/asf.xml | 168 +- Demos/Device/ClassDriver/VirtualSerial/asf.xml | 124 +- .../ClassDriver/VirtualSerialMassStorage/asf.xml | 140 +- .../Device/ClassDriver/VirtualSerialMouse/asf.xml | 128 +- Demos/Device/LowLevel/AudioInput/asf.xml | 104 +- Demos/Device/LowLevel/AudioOutput/asf.xml | 102 +- Demos/Device/LowLevel/DualVirtualSerial/asf.xml | 124 +- Demos/Device/LowLevel/GenericHID/asf.xml | 126 +- Demos/Device/LowLevel/Joystick/asf.xml | 124 +- Demos/Device/LowLevel/Keyboard/asf.xml | 124 +- Demos/Device/LowLevel/KeyboardMouse/asf.xml | 124 +- Demos/Device/LowLevel/MIDI/asf.xml | 124 +- Demos/Device/LowLevel/MassStorage/asf.xml | 134 +- Demos/Device/LowLevel/Mouse/asf.xml | 124 +- Demos/Device/LowLevel/RNDISEthernet/asf.xml | 172 +- Demos/Device/LowLevel/VirtualSerial/asf.xml | 126 +- Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml | 112 +- .../Host/ClassDriver/AndroidAccessoryHost/asf.xml | 98 +- Demos/Host/ClassDriver/AudioInputHost/asf.xml | 96 +- Demos/Host/ClassDriver/AudioOutputHost/asf.xml | 104 +- .../ClassDriver/JoystickHostWithParser/asf.xml | 96 +- Demos/Host/ClassDriver/KeyboardHost/asf.xml | 96 +- .../ClassDriver/KeyboardHostWithParser/asf.xml | 96 +- Demos/Host/ClassDriver/MIDIHost/asf.xml | 100 +- Demos/Host/ClassDriver/MassStorageHost/asf.xml | 96 +- Demos/Host/ClassDriver/MouseHost/asf.xml | 96 +- Demos/Host/ClassDriver/MouseHostWithParser/asf.xml | 96 +- Demos/Host/ClassDriver/PrinterHost/asf.xml | 96 +- Demos/Host/ClassDriver/RNDISEthernetHost/asf.xml | 96 +- Demos/Host/ClassDriver/StillImageHost/asf.xml | 96 +- Demos/Host/ClassDriver/VirtualSerialHost/asf.xml | 96 +- Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml | 110 +- Demos/Host/LowLevel/AudioInputHost/asf.xml | 100 +- Demos/Host/LowLevel/AudioOutputHost/asf.xml | 108 +- Demos/Host/LowLevel/GenericHIDHost/asf.xml | 100 +- Demos/Host/LowLevel/JoystickHostWithParser/asf.xml | 104 +- Demos/Host/LowLevel/KeyboardHost/asf.xml | 100 +- Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml | 104 +- Demos/Host/LowLevel/MIDIHost/asf.xml | 104 +- Demos/Host/LowLevel/MassStorageHost/asf.xml | 106 +- Demos/Host/LowLevel/MouseHost/asf.xml | 100 +- Demos/Host/LowLevel/MouseHostWithParser/asf.xml | 104 +- Demos/Host/LowLevel/PrinterHost/asf.xml | 106 +- Demos/Host/LowLevel/RNDISEthernetHost/asf.xml | 106 +- Demos/Host/LowLevel/StillImageHost/asf.xml | 108 +- Demos/Host/LowLevel/VirtualSerialHost/asf.xml | 100 +- LUFA/CodeTemplates/DeviceTemplate/asf.xml | 110 +- LUFA/CodeTemplates/HostTemplate/asf.xml | 82 +- LUFA/DoxygenPages/BuildSystem.txt | 562 +++---- LUFA/Drivers/Board/AVR8/QMK/Board.h | 130 +- LUFA/Drivers/Board/AVR8/QMK/LEDs.h | 388 ++--- LUFA/StudioIntegration/Docbook/placeholder.txt | 2 +- LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt | 90 +- .../HV1/lufa_studio_help_styling.css | 106 +- LUFA/StudioIntegration/VSIX/[Content_Types].xml | 26 +- LUFA/StudioIntegration/VSIX/asf-manifest.xml | 36 +- LUFA/StudioIntegration/VSIX/extension.vsixmanifest | 64 +- LUFA/StudioIntegration/VSIX/generate_caches.py | 76 +- LUFA/StudioIntegration/lufa.xml | 192 +-- LUFA/StudioIntegration/lufa_common.xml | 68 +- LUFA/StudioIntegration/lufa_drivers_board.xml | 228 +-- .../StudioIntegration/lufa_drivers_board_names.xml | 1706 ++++++++++---------- LUFA/StudioIntegration/lufa_drivers_misc.xml | 114 +- LUFA/StudioIntegration/lufa_drivers_peripheral.xml | 396 ++--- LUFA/StudioIntegration/lufa_drivers_usb.xml | 64 +- LUFA/StudioIntegration/lufa_drivers_usb_class.xml | 64 +- LUFA/StudioIntegration/lufa_drivers_usb_core.xml | 170 +- .../lufa_drivers_usb_core_avr8.xml | 86 +- .../lufa_drivers_usb_core_uc3.xml | 84 +- .../lufa_drivers_usb_core_xmega.xml | 72 +- LUFA/StudioIntegration/lufa_platform.xml | 120 +- LUFA/StudioIntegration/lufa_platform_uc3.xml | 52 +- LUFA/StudioIntegration/lufa_platform_xmega.xml | 46 +- LUFA/StudioIntegration/lufa_toolchain.xml | 90 +- Projects/AVRISP-MKII/asf.xml | 182 +-- Projects/Benito/asf.xml | 106 +- Projects/HIDReportViewer/asf.xml | 96 +- Projects/LEDNotifier/asf.xml | 102 +- Projects/MIDIToneGenerator/asf.xml | 100 +- Projects/Magstripe/asf.xml | 104 +- Projects/MediaController/asf.xml | 100 +- Projects/MissileLauncher/asf.xml | 98 +- Projects/RelayBoard/asf.xml | 94 +- Projects/SerialToLCD/asf.xml | 102 +- Projects/TempDataLogger/asf.xml | 144 +- Projects/USBtoSerial/asf.xml | 102 +- Projects/Webserver/asf.xml | 192 +-- 108 files changed, 7742 insertions(+), 7742 deletions(-) diff --git a/Bootloaders/CDC/asf.xml b/Bootloaders/CDC/asf.xml index 72f3ff04c7..02e7063c66 100644 --- a/Bootloaders/CDC/asf.xml +++ b/Bootloaders/CDC/asf.xml @@ -1,161 +1,161 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CDC Class Bootloader, capable of reprogramming a device using avrdude or other AVR109 protocol compliant software when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CDC Class Bootloader, capable of reprogramming a device using avrdude or other AVR109 protocol compliant software when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bootloaders/DFU/asf.xml b/Bootloaders/DFU/asf.xml index 6f3312b764..f56aba69f5 100644 --- a/Bootloaders/DFU/asf.xml +++ b/Bootloaders/DFU/asf.xml @@ -1,156 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DFU Class Bootloader, capable of reprogramming a device using the Atmel FLIP or other AVR DFU programming software when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DFU Class Bootloader, capable of reprogramming a device using the Atmel FLIP or other AVR DFU programming software when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bootloaders/HID/asf.xml b/Bootloaders/HID/asf.xml index 9394b13530..c67b9419ed 100644 --- a/Bootloaders/HID/asf.xml +++ b/Bootloaders/HID/asf.xml @@ -1,123 +1,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HID Class Bootloader, capable of reprogramming a device via a custom cross-platform command line utility when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HID Class Bootloader, capable of reprogramming a device via a custom cross-platform command line utility when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bootloaders/MassStorage/BootloaderAPITable.S b/Bootloaders/MassStorage/BootloaderAPITable.S index 30165700d7..44eb15ea9d 100644 --- a/Bootloaders/MassStorage/BootloaderAPITable.S +++ b/Bootloaders/MassStorage/BootloaderAPITable.S @@ -1,102 +1,102 @@ -/* - 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. -*/ - -#if AUX_BOOT_SECTION_SIZE > 0 -#warning Using a AUX bootloader section in addition to the defined bootloader space (see documentation). - -; Trampoline to jump over the AUX bootloader section to the start of the bootloader, -; on devices where an AUX bootloader section is used. -.section .boot_aux_trampoline, "ax" -.global Boot_AUX_Trampoline -Boot_AUX_Trampoline: - jmp BOOT_START_ADDR -#endif - -; Trampolines to actual API implementations if the target address is outside the -; range of a rjmp instruction (can happen with large bootloader sections) -.section .apitable_trampolines, "ax" -.global BootloaderAPI_Trampolines -BootloaderAPI_Trampolines: - - BootloaderAPI_ErasePage_Trampoline: - jmp BootloaderAPI_ErasePage - BootloaderAPI_WritePage_Trampoline: - jmp BootloaderAPI_WritePage - BootloaderAPI_FillWord_Trampoline: - jmp BootloaderAPI_FillWord - BootloaderAPI_ReadSignature_Trampoline: - jmp BootloaderAPI_ReadSignature - BootloaderAPI_ReadFuse_Trampoline: - jmp BootloaderAPI_ReadFuse - BootloaderAPI_ReadLock_Trampoline: - jmp BootloaderAPI_ReadLock - BootloaderAPI_WriteLock_Trampoline: - jmp BootloaderAPI_WriteLock - BootloaderAPI_UNUSED1: - ret - BootloaderAPI_UNUSED2: - ret - BootloaderAPI_UNUSED3: - ret - BootloaderAPI_UNUSED4: - ret - BootloaderAPI_UNUSED5: - ret - - - -; API function jump table -.section .apitable_jumptable, "ax" -.global BootloaderAPI_JumpTable -BootloaderAPI_JumpTable: - - rjmp BootloaderAPI_ErasePage_Trampoline - rjmp BootloaderAPI_WritePage_Trampoline - rjmp BootloaderAPI_FillWord_Trampoline - rjmp BootloaderAPI_ReadSignature_Trampoline - rjmp BootloaderAPI_ReadFuse_Trampoline - rjmp BootloaderAPI_ReadLock_Trampoline - rjmp BootloaderAPI_WriteLock_Trampoline - rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1 - rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2 - rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3 - rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4 - rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5 - - - -; Bootloader table signatures and information -.section .apitable_signatures, "ax" -.global BootloaderAPI_Signatures -BootloaderAPI_Signatures: - - .long BOOT_START_ADDR ; Start address of the bootloader - .word 0xDF30 ; Signature for the MS class bootloader, V1 - .word 0xDCFB ; Signature for a LUFA class bootloader +/* + 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. +*/ + +#if AUX_BOOT_SECTION_SIZE > 0 +#warning Using a AUX bootloader section in addition to the defined bootloader space (see documentation). + +; Trampoline to jump over the AUX bootloader section to the start of the bootloader, +; on devices where an AUX bootloader section is used. +.section .boot_aux_trampoline, "ax" +.global Boot_AUX_Trampoline +Boot_AUX_Trampoline: + jmp BOOT_START_ADDR +#endif + +; Trampolines to actual API implementations if the target address is outside the +; range of a rjmp instruction (can happen with large bootloader sections) +.section .apitable_trampolines, "ax" +.global BootloaderAPI_Trampolines +BootloaderAPI_Trampolines: + + BootloaderAPI_ErasePage_Trampoline: + jmp BootloaderAPI_ErasePage + BootloaderAPI_WritePage_Trampoline: + jmp BootloaderAPI_WritePage + BootloaderAPI_FillWord_Trampoline: + jmp BootloaderAPI_FillWord + BootloaderAPI_ReadSignature_Trampoline: + jmp BootloaderAPI_ReadSignature + BootloaderAPI_ReadFuse_Trampoline: + jmp BootloaderAPI_ReadFuse + BootloaderAPI_ReadLock_Trampoline: + jmp BootloaderAPI_ReadLock + BootloaderAPI_WriteLock_Trampoline: + jmp BootloaderAPI_WriteLock + BootloaderAPI_UNUSED1: + ret + BootloaderAPI_UNUSED2: + ret + BootloaderAPI_UNUSED3: + ret + BootloaderAPI_UNUSED4: + ret + BootloaderAPI_UNUSED5: + ret + + + +; API function jump table +.section .apitable_jumptable, "ax" +.global BootloaderAPI_JumpTable +BootloaderAPI_JumpTable: + + rjmp BootloaderAPI_ErasePage_Trampoline + rjmp BootloaderAPI_WritePage_Trampoline + rjmp BootloaderAPI_FillWord_Trampoline + rjmp BootloaderAPI_ReadSignature_Trampoline + rjmp BootloaderAPI_ReadFuse_Trampoline + rjmp BootloaderAPI_ReadLock_Trampoline + rjmp BootloaderAPI_WriteLock_Trampoline + rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1 + rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2 + rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3 + rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4 + rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5 + + + +; Bootloader table signatures and information +.section .apitable_signatures, "ax" +.global BootloaderAPI_Signatures +BootloaderAPI_Signatures: + + .long BOOT_START_ADDR ; Start address of the bootloader + .word 0xDF30 ; Signature for the MS class bootloader, V1 + .word 0xDCFB ; Signature for a LUFA class bootloader diff --git a/Bootloaders/MassStorage/asf.xml b/Bootloaders/MassStorage/asf.xml index f1d550d1eb..700ffa26ff 100644 --- a/Bootloaders/MassStorage/asf.xml +++ b/Bootloaders/MassStorage/asf.xml @@ -1,156 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -