From adf573ba3b394eceeb7783418312a350dc14a879 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Thu, 22 Apr 2010 16:39:08 -0600 Subject: [PATCH] Fix copyrights now that Sporian has granted TMI the right to create derivative works releasable under tos-bsl's BSD license. --- .../msp430/pybsl/cp210x_rt/cp210xrtmodule.c | 39 +++++++++++++++---- tools/platforms/msp430/pybsl/tos-bsl.in | 19 +-------- tools/platforms/msp430/pybsl/tos-bsl.txt | 3 +- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/tools/platforms/msp430/pybsl/cp210x_rt/cp210xrtmodule.c b/tools/platforms/msp430/pybsl/cp210x_rt/cp210xrtmodule.c index 17c046f8..393ed477 100644 --- a/tools/platforms/msp430/pybsl/cp210x_rt/cp210xrtmodule.c +++ b/tools/platforms/msp430/pybsl/cp210x_rt/cp210xrtmodule.c @@ -1,12 +1,37 @@ -/* Copyright (c) 2006-2007 by Sporian Microsystems, Inc. - * All Rights Reserved. +/* + * Copyright (c) 2010, Titanium Mirror, Inc. + * All rights reserved. + * Based upon work Copyright (c) 2006-2007 by Sporian Microsystems, Inc. * - * This document is the proprietary and confidential property of Sporian - * Microsystems, Inc. All use, distribution, reproduction or re-distribution - * is disallowed without the prior express written consent of Sporian - * Microsystems, Inc. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - Neither the name of the Technische Universität Berlin nor the names + * of its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + +/** + * @author R. Steve McKown + */ + #include #include #include diff --git a/tools/platforms/msp430/pybsl/tos-bsl.in b/tools/platforms/msp430/pybsl/tos-bsl.in index e928a138..0abf3d03 100644 --- a/tools/platforms/msp430/pybsl/tos-bsl.in +++ b/tools/platforms/msp430/pybsl/tos-bsl.in @@ -1,20 +1,6 @@ #!/usr/bin/env python # Serial Bootstrap Loader software for the MSP430 embedded proccessor. # -# Copyright (c) 2006-2007 by Sporian Microsystems, Inc. -# All Rights Reserved. -# -# This document is the proprietary and confidential property of Sporian -# Microsystems, Inc. All use, distribution, reproduction or re-distribution -# is disallowed without the prior express written consent of Sporian -# Microsystems, Inc. Portions of this document are derived from a source -# document covered by the license(s) below. -# -# This material is based upon work supported by the United States Navy under -# Contract No. N00030-06-C-0032. Any opinions, findings and conclusions or -# recommendations expressed in this material are those of the author(s) and do -# not necessarily reflect the views of the United States Navy. -# # (C) 2001-2003 Chris Liechti # this is distributed under a free software license, see license.txt # @@ -24,9 +10,8 @@ # Volker Rzehak # additional infos from slaa089a.pdf # -# Modularization by R. Steve McKown, including a simplification of the -# concepts of inversion and assertion. Reviewed slaa089d and slaa096d; -# no changes required due to updated documentation. +# Modularization by R. Steve McKown, . +# Based upon work Copyright (c) 2006-2007 by Sporian Microsystems, Inc. # # # Set and clear of digital signals diff --git a/tools/platforms/msp430/pybsl/tos-bsl.txt b/tools/platforms/msp430/pybsl/tos-bsl.txt index 4b47bd06..121687b0 100644 --- a/tools/platforms/msp430/pybsl/tos-bsl.txt +++ b/tools/platforms/msp430/pybsl/tos-bsl.txt @@ -13,7 +13,8 @@ It is released under a free software license, see tos-bsl-license.txt for more details. (C) 2001-2003 Chris Liechti -(C) 2007-2008 Sporian Microsystems, Inc. +(C) 2007-2010 Sporian Microsystems, Inc. and + Titanium Mirror, Inc. Features -------- -- 2.39.2