From 628bd9b682e746690b380c254b15ef370e99c565 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 22 Mar 2022 14:40:34 -0500 Subject: cpukit/: Update Eric Norum contact info and normalize file headers --- cpukit/include/rtems/tftp.h | 35 +++++++++++++---- cpukit/libcsupport/src/getgrent.c | 2 +- cpukit/libcsupport/src/getgrnam.c | 2 +- cpukit/libcsupport/src/getpwent.c | 2 +- cpukit/libcsupport/src/pwdgrp.c | 2 +- cpukit/libcsupport/src/termios.c | 13 ++----- cpukit/libcsupport/src/termiosinitialize.c | 13 ++----- cpukit/libfs/src/ftpfs/tftpDriver.c | 2 +- cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h | 46 ++++++++++++----------- 9 files changed, 66 insertions(+), 51 deletions(-) (limited to 'cpukit') diff --git a/cpukit/include/rtems/tftp.h b/cpukit/include/rtems/tftp.h index ed3ebd7865..8fa516042b 100644 --- a/cpukit/include/rtems/tftp.h +++ b/cpukit/include/rtems/tftp.h @@ -1,13 +1,34 @@ -/* - * Trivial File Transfer Protocol (TFTP) +/** + * @file + * + * @brief * Trivial File Transfer Protocol (TFTP) * * Transfer file to/from remote host + */ + +/* + * Copyright (c) 1998 Eric Norum + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. * - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * Saskatoon, Saskatchewan, CANADA - * eric@skatter.usask.ca + * 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. */ /* diff --git a/cpukit/libcsupport/src/getgrent.c b/cpukit/libcsupport/src/getgrent.c index d4d3705115..e52724edf3 100644 --- a/cpukit/libcsupport/src/getgrent.c +++ b/cpukit/libcsupport/src/getgrent.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/getgrnam.c b/cpukit/libcsupport/src/getgrnam.c index 71c613499a..6ab7fe5d31 100644 --- a/cpukit/libcsupport/src/getgrnam.c +++ b/cpukit/libcsupport/src/getgrnam.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/getpwent.c b/cpukit/libcsupport/src/getpwent.c index 400a53e5f3..ce2b5a59da 100644 --- a/cpukit/libcsupport/src/getpwent.c +++ b/cpukit/libcsupport/src/getpwent.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/pwdgrp.c b/cpukit/libcsupport/src/pwdgrp.c index d686829e05..258978a0ac 100644 --- a/cpukit/libcsupport/src/pwdgrp.c +++ b/cpukit/libcsupport/src/pwdgrp.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index 4a4a7e77ac..fe006219dd 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -4,16 +4,11 @@ */ /* - * Author: - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * Saskatoon, Saskatchewan, CANADA - * eric@skatter.usask.ca + * Copyright (c) 1997 Eric Norum * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. */ #ifdef HAVE_CONFIG_H diff --git a/cpukit/libcsupport/src/termiosinitialize.c b/cpukit/libcsupport/src/termiosinitialize.c index 2ea34f08b3..35aa1eb955 100644 --- a/cpukit/libcsupport/src/termiosinitialize.c +++ b/cpukit/libcsupport/src/termiosinitialize.c @@ -6,16 +6,11 @@ */ /* - * Author: - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * Saskatoon, Saskatchewan, CANADA - * eric@skatter.usask.ca + * Copyright (c) 1997 Eric Norum * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. */ #ifdef HAVE_CONFIG_H diff --git a/cpukit/libfs/src/ftpfs/tftpDriver.c b/cpukit/libfs/src/ftpfs/tftpDriver.c index 896aaf132d..bebe748ca5 100644 --- a/cpukit/libfs/src/ftpfs/tftpDriver.c +++ b/cpukit/libfs/src/ftpfs/tftpDriver.c @@ -9,7 +9,7 @@ */ /* - * Copyright 1998 Eric Norum + * Copyright (c) 1998 Eric Norum * * Modifications to support reference counting in the file system are * Copyright (c) 2012 embedded brains GmbH. diff --git a/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h b/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h index dc181d0cdf..4af1096c12 100644 --- a/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h +++ b/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h @@ -2,29 +2,33 @@ * @file * * @brief Definitions for Motorola MC68360 Processor + * + * Motorola MC68360 Quad Integrated Communications Controller (QUICC) */ + /* - ************************************************************************** - ************************************************************************** - ** ** - ** MOTOROLA MC68360 QUAD INTEGRATED COMMUNICATIONS CONTROLLER (QUICC) ** - ** ** - ** HARDWARE DECLARATIONS ** - ** ** - ** ** - ** Submitted By: ** - ** ** - ** W. Eric Norum ** - ** Saskatchewan Accelerator Laboratory ** - ** University of Saskatchewan ** - ** 107 North Road ** - ** Saskatoon, Saskatchewan, CANADA ** - ** S7N 5C6 ** - ** ** - ** eric@skatter.usask.ca ** - ** ** - ************************************************************************** - ************************************************************************** + * Copyright (c) 1996 Eric Norum + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * 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. */ #ifndef _RTEMS_M68K_M68360_H -- cgit v1.2.3