Revert change to assembly file comment syntax; this apparently breaks on the current AVR32 GNU assembler.

13 years ago · 7e65340c31
parent 6fa8da4e56
commit 7e65340c31
5 changed files with 137 additions and 131 deletions
--- a/Bootloaders/CDC/BootloaderAPITable.S
+++ b/Bootloaders/CDC/BootloaderAPITable.S
@ -1,32 +1,32 @@
-;
-;             LUFA Library
-;     Copyright (C) Dean Camera, 2012.
-;
-;  dean [at] fourwalledcubicle [dot] com
-;           www.lufa-lib.org
-;
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.

-;  Copyright 2012  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 disclaim 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.
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/

+/*
+  Copyright 2011  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 disclaim 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.
+*/

 ; Trampolines to actual API implementations if the target address is outside the
 ; range of a rjmp instruction (can happen with large bootloader sections)
--- a/Bootloaders/DFU/BootloaderAPITable.S
+++ b/Bootloaders/DFU/BootloaderAPITable.S
@ -1,32 +1,32 @@
-;
-;             LUFA Library
-;     Copyright (C) Dean Camera, 2012.
-;
-;  dean [at] fourwalledcubicle [dot] com
-;           www.lufa-lib.org
-;
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.

-;  Copyright 2012  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 disclaim 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.
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/

+/*
+  Copyright 2012  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 disclaim 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.
+*/

 ; Trampolines to actual API implementations if the target address is outside the
 ; range of a rjmp instruction (can happen with large bootloader sections)
--- a/BuildTests/ModuleTest/Dummy.S
+++ b/BuildTests/ModuleTest/Dummy.S
@ -1,30 +1,32 @@
-;
-;             LUFA Library
-;     Copyright (C) Dean Camera, 2012.
-;
-;  dean [at] fourwalledcubicle [dot] com
-;           www.lufa-lib.org
-;
-
-;  Copyright 2012  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 disclaim 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.
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  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 disclaim 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.
+*/

 .section .text

--- a/BuildTests/SingleUSBModeTest/Dummy.S
+++ b/BuildTests/SingleUSBModeTest/Dummy.S
@ -1,30 +1,32 @@
-;
-;             LUFA Library
-;     Copyright (C) Dean Camera, 2012.
-;
-;  dean [at] fourwalledcubicle [dot] com
-;           www.lufa-lib.org
-;
-
-;  Copyright 2012  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 disclaim 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.
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  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 disclaim 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.
+*/

 .section .text

--- a/LUFA/Platform/UC3/Exception.S
+++ b/LUFA/Platform/UC3/Exception.S
@ -1,30 +1,32 @@
-;
-;             LUFA Library
-;     Copyright (C) Dean Camera, 2012.
-;
-;  dean [at] fourwalledcubicle [dot] com
-;           www.lufa-lib.org
-;
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.

-;  Copyright 2012  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 disclaim 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.
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  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 disclaim 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 defined(__AVR32__)
 #include <avr32/io.h>