From 34dc99625d99a68273ac46eeb33fab18dfba19b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 20 Nov 2010 18:41:52 +0000 Subject: [PATCH] Update copyrights. Btw Axel, keyboard.cpp (forked from the bios_ia32 one) is still under "OpenBeOS licence" with 2 other copies, I suppose you are ok to change to MIT ? git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39548 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/platform/atari_m68k/Handle.cpp | 1 + src/system/boot/platform/atari_m68k/Handle.h | 1 + src/system/boot/platform/atari_m68k/console.cpp | 2 +- src/system/boot/platform/atari_m68k/cpu.cpp | 7 ++----- src/system/boot/platform/atari_m68k/cpu.h | 2 +- src/system/boot/platform/atari_m68k/debug.cpp | 2 +- src/system/boot/platform/atari_m68k/devices.cpp | 1 + src/system/boot/platform/atari_m68k/keyboard.cpp | 7 ++++--- src/system/boot/platform/atari_m68k/menu.cpp | 1 + src/system/boot/platform/atari_m68k/mmu.cpp | 1 + src/system/boot/platform/atari_m68k/mmu.h | 1 + src/system/boot/platform/atari_m68k/shell.S | 4 +--- src/system/boot/platform/atari_m68k/stage1.S | 4 +--- src/system/boot/platform/atari_m68k/start.cpp | 2 +- src/system/boot/platform/atari_m68k/toscalls.cpp | 2 +- src/system/boot/platform/atari_m68k/toscalls.h | 7 ++----- src/system/boot/platform/atari_m68k/video.cpp | 1 + src/system/boot/platform/atari_m68k/video.h | 7 ++++--- 18 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/system/boot/platform/atari_m68k/Handle.cpp b/src/system/boot/platform/atari_m68k/Handle.cpp index f3d77c9f59..7ee9d3e8d6 100644 --- a/src/system/boot/platform/atari_m68k/Handle.cpp +++ b/src/system/boot/platform/atari_m68k/Handle.cpp @@ -1,4 +1,5 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/Handle.h b/src/system/boot/platform/atari_m68k/Handle.h index ee1ef917cc..330294f6e8 100644 --- a/src/system/boot/platform/atari_m68k/Handle.h +++ b/src/system/boot/platform/atari_m68k/Handle.h @@ -1,4 +1,5 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/console.cpp b/src/system/boot/platform/atari_m68k/console.cpp index b9e219ef29..71676546a3 100644 --- a/src/system/boot/platform/atari_m68k/console.cpp +++ b/src/system/boot/platform/atari_m68k/console.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2007, Haiku, Inc. All Rights Reserved. + * Copyright 2007-2010, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT license. * * Author: diff --git a/src/system/boot/platform/atari_m68k/cpu.cpp b/src/system/boot/platform/atari_m68k/cpu.cpp index 604f496105..e71c1a76a7 100644 --- a/src/system/boot/platform/atari_m68k/cpu.cpp +++ b/src/system/boot/platform/atari_m68k/cpu.cpp @@ -1,10 +1,7 @@ /* - * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Distributed under the terms of the MIT License. - * - * calculate_cpu_conversion_factor() was written by Travis Geiselbrecht and - * licensed under the NewOS license. - */ +*/ #include "cpu.h" diff --git a/src/system/boot/platform/atari_m68k/cpu.h b/src/system/boot/platform/atari_m68k/cpu.h index f8eff4f44a..72df1fc3ae 100644 --- a/src/system/boot/platform/atari_m68k/cpu.h +++ b/src/system/boot/platform/atari_m68k/cpu.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Distributed under the terms of the MIT License. */ #ifndef CPU_H diff --git a/src/system/boot/platform/atari_m68k/debug.cpp b/src/system/boot/platform/atari_m68k/debug.cpp index 8de10826e9..7aef7692d3 100644 --- a/src/system/boot/platform/atari_m68k/debug.cpp +++ b/src/system/boot/platform/atari_m68k/debug.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/devices.cpp b/src/system/boot/platform/atari_m68k/devices.cpp index 3ed07b47fc..8abfa678a4 100644 --- a/src/system/boot/platform/atari_m68k/devices.cpp +++ b/src/system/boot/platform/atari_m68k/devices.cpp @@ -1,4 +1,5 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/keyboard.cpp b/src/system/boot/platform/atari_m68k/keyboard.cpp index 03b69c25b5..e3231d2a95 100644 --- a/src/system/boot/platform/atari_m68k/keyboard.cpp +++ b/src/system/boot/platform/atari_m68k/keyboard.cpp @@ -1,7 +1,8 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. + * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the OpenBeOS License. + */ #include "keyboard.h" diff --git a/src/system/boot/platform/atari_m68k/menu.cpp b/src/system/boot/platform/atari_m68k/menu.cpp index 26727a99da..24125b389d 100644 --- a/src/system/boot/platform/atari_m68k/menu.cpp +++ b/src/system/boot/platform/atari_m68k/menu.cpp @@ -1,4 +1,5 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/mmu.cpp b/src/system/boot/platform/atari_m68k/mmu.cpp index 9c459b1e88..d2d2ec3def 100644 --- a/src/system/boot/platform/atari_m68k/mmu.cpp +++ b/src/system/boot/platform/atari_m68k/mmu.cpp @@ -1,4 +1,5 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. * Based on code written by Travis Geiselbrecht for NewOS. * diff --git a/src/system/boot/platform/atari_m68k/mmu.h b/src/system/boot/platform/atari_m68k/mmu.h index 196a3bc14f..b8f4ec14d9 100644 --- a/src/system/boot/platform/atari_m68k/mmu.h +++ b/src/system/boot/platform/atari_m68k/mmu.h @@ -1,4 +1,5 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/shell.S b/src/system/boot/platform/atari_m68k/shell.S index 1351104f17..a71f2f176d 100644 --- a/src/system/boot/platform/atari_m68k/shell.S +++ b/src/system/boot/platform/atari_m68k/shell.S @@ -1,11 +1,9 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Copyright 2005, Ingo Weinhold, bonefish@users.sf.net. * Copyright 2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT license. - * - * Author: - * François Revol, revol@free.fr. */ /** This file contains the boot floppy and BFS boot block entry points for diff --git a/src/system/boot/platform/atari_m68k/stage1.S b/src/system/boot/platform/atari_m68k/stage1.S index a35165af83..72ef845fea 100644 --- a/src/system/boot/platform/atari_m68k/stage1.S +++ b/src/system/boot/platform/atari_m68k/stage1.S @@ -1,10 +1,8 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2005, Ingo Weinhold, bonefish@users.sf.net. * Copyright 2007, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT license. - * - * Author: - * François Revol, revol@free.fr. */ #define FUNCTION(x) .global x; .type x,@function; x diff --git a/src/system/boot/platform/atari_m68k/start.cpp b/src/system/boot/platform/atari_m68k/start.cpp index c06964a490..a7fd43ffbb 100644 --- a/src/system/boot/platform/atari_m68k/start.cpp +++ b/src/system/boot/platform/atari_m68k/start.cpp @@ -1,6 +1,6 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2003-2010, Axel Dörfler, axeld@pinc-software.de. - * Copyright 2008, François Revol, revol@free.fr. All rights reserved. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/toscalls.cpp b/src/system/boot/platform/atari_m68k/toscalls.cpp index 6b85f5a1cf..0b3517879a 100644 --- a/src/system/boot/platform/atari_m68k/toscalls.cpp +++ b/src/system/boot/platform/atari_m68k/toscalls.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008, François Revol, revol@free.fr. All rights reserved. + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/toscalls.h b/src/system/boot/platform/atari_m68k/toscalls.h index 41bafda4a5..0b84b8867f 100644 --- a/src/system/boot/platform/atari_m68k/toscalls.h +++ b/src/system/boot/platform/atari_m68k/toscalls.h @@ -1,9 +1,6 @@ /* - * Copyright 2007, Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT license. - * - * Author: - * François Revol, revol@free.fr. + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. + * Distributed under the terms of the MIT License. */ #ifndef _TOSCALLS_H #define _TOSCALLS_H diff --git a/src/system/boot/platform/atari_m68k/video.cpp b/src/system/boot/platform/atari_m68k/video.cpp index 41dc1e90ee..7a225ecdf5 100644 --- a/src/system/boot/platform/atari_m68k/video.cpp +++ b/src/system/boot/platform/atari_m68k/video.cpp @@ -1,4 +1,5 @@ /* + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. */ diff --git a/src/system/boot/platform/atari_m68k/video.h b/src/system/boot/platform/atari_m68k/video.h index bd494613b2..33d04e6b23 100644 --- a/src/system/boot/platform/atari_m68k/video.h +++ b/src/system/boot/platform/atari_m68k/video.h @@ -1,7 +1,8 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ + * Copyright 2008-2010, François Revol, revol@free.fr. All rights reserved. + * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the Haiku License. + */ #ifndef VIDEO_H #define VIDEO_H