From 081b658e2d660abf40daf89b616658b00ad096e5 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 23 Mar 2012 16:41:30 +0100 Subject: [PATCH] Update copyright notices --- README | 19 +++++++++++++------ examples/basic2_sim.py | 3 +++ examples/basic_sim.py | 3 +++ examples/fir.py | 3 +++ examples/memory_sim.py | 3 +++ examples/wb_initiator.py | 3 +++ migen/sim/generic.py | 3 +++ migen/sim/icarus.py | 3 +++ migen/sim/ipc.py | 3 +++ vpi/ipc.c | 5 +++++ vpi/ipc.h | 5 +++++ vpi/main.c | 5 +++++ 12 files changed, 52 insertions(+), 6 deletions(-) diff --git a/README b/README index 223b815e..0046db95 100644 --- a/README +++ b/README @@ -54,11 +54,18 @@ presumption that third-party software is unaffected by the copyleft requirements of the license of Migen. Unless otherwise noted, Migen's source code is copyright (C) 2011-2012 -Sebastien Bourdeauducq. Other authors retain ownership of their -contributions. If a submission can reasonably be considered -independently copyrightable, it's yours and I encourage you to claim it -with appropriate copyright notices. This submission then falls under the -"otherwise noted" category. All submissions must use a license -compatible with the GPL and the exception above. +Sebastien Bourdeauducq. + +The simulation extension (as mentioned in the comments at the beginning +of the corresponding source files) is copyright (C) 2012 Vermeer +Manufacturing Co. + +Other authors retain ownership of their contributions. If a submission +can reasonably be considered independently copyrightable, it's yours and +I encourage you to claim it with appropriate copyright notices. This +submission then falls under the "otherwise noted" category. All +submissions must use a license compatible with the GPL and the exception +above. + "Electricity! It's like magic!" diff --git a/examples/basic2_sim.py b/examples/basic2_sim.py index f7bb0d02..a4387f76 100644 --- a/examples/basic2_sim.py +++ b/examples/basic2_sim.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + from migen.fhdl.structure import * from migen.sim.generic import Simulator, TopLevel from migen.sim.icarus import Runner diff --git a/examples/basic_sim.py b/examples/basic_sim.py index 900fcede..af00d0df 100644 --- a/examples/basic_sim.py +++ b/examples/basic_sim.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + from migen.fhdl.structure import * from migen.sim.generic import Simulator from migen.sim.icarus import Runner diff --git a/examples/fir.py b/examples/fir.py index 3e6490a5..0212fdb2 100644 --- a/examples/fir.py +++ b/examples/fir.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + from math import cos, pi from scipy import signal diff --git a/examples/memory_sim.py b/examples/memory_sim.py index 765b0de8..34ae1126 100644 --- a/examples/memory_sim.py +++ b/examples/memory_sim.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + from migen.fhdl.structure import * from migen.sim.generic import Simulator from migen.sim.icarus import Runner diff --git a/examples/wb_initiator.py b/examples/wb_initiator.py index 04caecd4..d5e38adc 100644 --- a/examples/wb_initiator.py +++ b/examples/wb_initiator.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + from random import Random from migen.fhdl.structure import * diff --git a/migen/sim/generic.py b/migen/sim/generic.py index dddc7e41..5eb3670e 100644 --- a/migen/sim/generic.py +++ b/migen/sim/generic.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + from migen.fhdl.structure import * from migen.fhdl import verilog from migen.sim.ipc import * diff --git a/migen/sim/icarus.py b/migen/sim/icarus.py index 0661c307..0c76e14d 100644 --- a/migen/sim/icarus.py +++ b/migen/sim/icarus.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + import subprocess import os diff --git a/migen/sim/ipc.py b/migen/sim/ipc.py index f463dcff..fde8e696 100644 --- a/migen/sim/ipc.py +++ b/migen/sim/ipc.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012 Vermeer Manufacturing Co. +# License: GPLv3 with additional permissions (see README). + import socket import os diff --git a/vpi/ipc.c b/vpi/ipc.c index c76081d3..d41920c7 100644 --- a/vpi/ipc.c +++ b/vpi/ipc.c @@ -1,3 +1,8 @@ +/* + * Copyright (C) 2012 Vermeer Manufacturing Co. + * License: GPLv3 with additional permissions (see README). + */ + #include #include #include diff --git a/vpi/ipc.h b/vpi/ipc.h index baad5647..184858ee 100644 --- a/vpi/ipc.h +++ b/vpi/ipc.h @@ -1,3 +1,8 @@ +/* + * Copyright (C) 2012 Vermeer Manufacturing Co. + * License: GPLv3 with additional permissions (see README). + */ + #ifndef __IPC_H #define __IPC_H diff --git a/vpi/main.c b/vpi/main.c index 324be66d..74c13fd4 100644 --- a/vpi/main.c +++ b/vpi/main.c @@ -1,3 +1,8 @@ +/* + * Copyright (C) 2012 Vermeer Manufacturing Co. + * License: GPLv3 with additional permissions (see README). + */ + #include #include #include -- 2.30.2