Update Eric Norum contact info and start to normalize file headers

23 files changed, 143 insertions, 174 deletions

diff --git a/bsps/m68k/gen68360/README b/bsps/m68k/gen68360/README
index 0c595deb77..eec7d1554f 100644
--- a/bsps/m68k/gen68360/README
+++ b/bsps/m68k/gen68360/README
@@ -3,14 +3,7 @@
 #
 
 #
-# Please send any comments, improvements, or bug reports to:
-#	W. Eric Norum
-#	Deparment of Electrical Engineering
-#	53 Campus Driver
-#	University of Saskatchewan
-#	Saskatoon, Saskatchewan, CANADA
-#	S7N 5A9
-# eric.norum@usask.ca
+# Copyright (c) 1996 Eric Norum <eric@norum.ca>
 #
 
 #
diff --git a/bsps/m68k/gen68360/btimer/btimer.c b/bsps/m68k/gen68360/btimer/btimer.c
index 40a3e0a4c1..db9d9b4ef4 100644
--- a/bsps/m68k/gen68360/btimer/btimer.c
+++ b/bsps/m68k/gen68360/btimer/btimer.c
@@ -2,31 +2,23 @@
  * Use TIMER 1 and TIMER 2 for Timing Test Suite
  * The hardware on the MC68360 makes these routines very simple.
  *
- * Based on the `gen68302' board support package, and covered by the
- * original distribution terms.
+ *  NOTE: It is important that the timer start/stop overhead be
+ *        determined when porting or modifying this code.
  *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
  */
 
 /*
+ * Based on the `gen68302' board support package, and covered by the
+ * original distribution terms.
  *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  NOTE: It is important that the timer start/stop overhead be
- *        determined when porting or modifying this code.
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
+ * Copyright (c) 1996 Eric Norum <eric@norum.ca>
+ * 
+ * COPYRIGHT (c) 1989-1999.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/gen68360/clock/clock.c b/bsps/m68k/gen68360/clock/clock.c
index 4bd3204fcb..966b20dae4 100644
--- a/bsps/m68k/gen68360/clock/clock.c
+++ b/bsps/m68k/gen68360/clock/clock.c
@@ -3,12 +3,10 @@
  *
  * The PIT has rather poor resolution, but it is easy to set up
  * and requires no housekeeping once it is going.
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
+ */
+
+/*
+ * Copyright (c) 1996 Eric Norum <eric@norum.ca>
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/gen68360/console/console.c b/bsps/m68k/gen68360/console/console.c
index 36d8470168..4d0f2bcb20 100644
--- a/bsps/m68k/gen68360/console/console.c
+++ b/bsps/m68k/gen68360/console/console.c
@@ -8,19 +8,14 @@
  */
 
 /*
- *  Author:
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
+ * Copyright (c) 1996 Eric Norum <eric@norum.ca>
  *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 1989-1999.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <termios.h>
diff --git a/bsps/m68k/gen68360/include/bsp.h b/bsps/m68k/gen68360/include/bsp.h
index ac228e6fb5..0859e133f3 100644
--- a/bsps/m68k/gen68360/include/bsp.h
+++ b/bsps/m68k/gen68360/include/bsp.h
@@ -7,25 +7,14 @@
  */
 
 /*
+ * Copyright (c) 1996 Eric Norum <eric@norum.ca>
  *
- * Based on the `gen68302' board support package, and covered by the
- * original distribution terms.
+ * COPYRIGHT (c) 1989-1999.
+ * On-Line Applications Research Corporation (OAR).
  *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- */
-
-/*  bsp.h
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  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.
  */
 
 #ifndef LIBBSP_M68K_GEN68360_BSP_H
diff --git a/bsps/m68k/gen68360/start/alloc360.c b/bsps/m68k/gen68360/start/alloc360.c
index 53f90876e4..ec7abfa151 100644
--- a/bsps/m68k/gen68360/start/alloc360.c
+++ b/bsps/m68k/gen68360/start/alloc360.c
@@ -1,11 +1,9 @@
 /*
  * MC68360 buffer descriptor allocation routines
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
+ */
+
+/*
+ * Copyright (c) 1996 Eric Norum <eric@norum.ca>
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/gen68360/start/init68360.c b/bsps/m68k/gen68360/start/init68360.c
index 67fed27a3b..1ae3266e7c 100644
--- a/bsps/m68k/gen68360/start/init68360.c
+++ b/bsps/m68k/gen68360/start/init68360.c
@@ -3,11 +3,7 @@
  */
 
 /*
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
+ * Copyright (c) 1996 Eric Norum <eric@norum.ca>
  */
 
 #include <bsp.h>
diff --git a/bsps/m68k/gen68360/start/start.S b/bsps/m68k/gen68360/start/start.S
index e1f8122524..1157144314 100644
--- a/bsps/m68k/gen68360/start/start.S
+++ b/bsps/m68k/gen68360/start/start.S
@@ -3,22 +3,17 @@
  *  This file contains the entry point for the application.
  *  It jumps to the BSP which is responsible for performing
  *  all initialization.
+ */
+
+/*
+ * Copyright (c) 1996 Eric Norum <eric@norum.ca>
+
+ * COPYRIGHT (c) 1989-1999.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- *
- * Based on the `gen68302' board support package, and covered by the
- * original distribution terms.
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
+ * The license and distribution terms for this file may in
+ * the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
  */
 
 #include <rtems/asm.h>
diff --git a/bsps/m68k/mcf5206elite/start/gdbinit b/bsps/m68k/mcf5206elite/start/gdbinit
index 9954b8cb9a..5da23d3355 100644
--- a/bsps/m68k/mcf5206elite/start/gdbinit
+++ b/bsps/m68k/mcf5206elite/start/gdbinit
@@ -4,12 +4,12 @@
 # The main purpose of this script is to perform minimum initialization of
 # processor so code can be loaded. Also, exception handling is performed.
 # 
+
 # Copyright (C) OKTET Ltd., St.-Petersburg, Russia
 # Author: Victor V. Vengerov <vvv@oktet.ru>
 #
 # This script partially based on gdb scripts written by 
-# Eric Norum, <eric@skatter.usask.ca>
-#
+# Eric Norum, <eric@norum.ca>
 #
 # The license and distribution terms for this file may be
 # found in the file LICENSE in this distribution or at
diff --git a/bsps/m68k/mcf52235/btimer/btimer.c b/bsps/m68k/mcf52235/btimer/btimer.c
index f9122542c2..28ec8e411d 100644
--- a/bsps/m68k/mcf52235/btimer/btimer.c
+++ b/bsps/m68k/mcf52235/btimer/btimer.c
@@ -2,15 +2,17 @@
  *  Timer Init
  *
  *  Use the last DMA timer (DTIM3) as the diagnostic timer.
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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 a
+ * http://www.rtems.org/license/LICENSE.
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/mcf5225x/btimer/btimer.c b/bsps/m68k/mcf5225x/btimer/btimer.c
index ac0ca6d7d0..9f7c24482d 100644
--- a/bsps/m68k/mcf5225x/btimer/btimer.c
+++ b/bsps/m68k/mcf5225x/btimer/btimer.c
@@ -2,15 +2,17 @@
  *  Timer Init
  *
  *  Use the last DMA timer (DTIM3) as the diagnostic timer.
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005-2010.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005-2010.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/mcf5329/btimer/btimer.c b/bsps/m68k/mcf5329/btimer/btimer.c
index 0f762c0a6a..ab21087fbf 100644
--- a/bsps/m68k/mcf5329/btimer/btimer.c
+++ b/bsps/m68k/mcf5329/btimer/btimer.c
@@ -2,15 +2,17 @@
  *  Timer Init
  *
  *  Use the last DMA timer (DTIM3) as the diagnostic timer.
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/shared/fpsp/README b/bsps/m68k/shared/fpsp/README
index 9917fd4fd8..8607c525d5 100644
--- a/bsps/m68k/shared/fpsp/README
+++ b/bsps/m68k/shared/fpsp/README
@@ -1,7 +1,7 @@
 M68040FPSP -- Motorola 68040 floating point support package
 -----------------------------------------------------------
 
-Modified for RTEMS by Eric Norum (eric@skatter.usask.ca)
+Modified for RTEMS by Eric Norum (eric@norum.ca)
 
 To include these routines in your application call
 
diff --git a/bsps/m68k/shared/fpsp/rtems_skel.S b/bsps/m68k/shared/fpsp/rtems_skel.S
index 501387f136..79c574e59f 100644
--- a/bsps/m68k/shared/fpsp/rtems_skel.S
+++ b/bsps/m68k/shared/fpsp/rtems_skel.S
@@ -39,7 +39,7 @@
 
 //
 //	Modified for Linux-1.3.x by Jes Sorensen (jds@kom.auc.dk)
-//	Modified for RTEMS 4.0.0 by Eric Norum (eric@skatter.usask.ca)
+//	Modified for RTEMS 4.0.0 by Eric Norum (eric@snorum.ca)
 //
 
 #include <rtems/asm.h>
diff --git a/bsps/m68k/uC5282/btimer/btimer.c b/bsps/m68k/uC5282/btimer/btimer.c
index e01b9c8269..c60527670a 100644
--- a/bsps/m68k/uC5282/btimer/btimer.c
+++ b/bsps/m68k/uC5282/btimer/btimer.c
@@ -2,15 +2,17 @@
  *  Timer Init
  *
  *  Use the last DMA timer (DTIM3) as the diagnostic timer.
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/uC5282/clock/clock.c b/bsps/m68k/uC5282/clock/clock.c
index da724a9aca..59d67af296 100644
--- a/bsps/m68k/uC5282/clock/clock.c
+++ b/bsps/m68k/uC5282/clock/clock.c
@@ -1,14 +1,16 @@
 /*
  * Use the last periodic interval timer (PIT3) as the system clock.
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/uC5282/console/console.c b/bsps/m68k/uC5282/console/console.c
index 276d0c6f18..50a90d3dd9 100644
--- a/bsps/m68k/uC5282/console/console.c
+++ b/bsps/m68k/uC5282/console/console.c
@@ -2,16 +2,17 @@
  *  Multi UART console serial I/O.
  *
  * TO DO: Add DMA input/output
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  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.
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
+ * 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.
  */
 
 #include <stdio.h>
diff --git a/bsps/m68k/uC5282/include/bsp.h b/bsps/m68k/uC5282/include/bsp.h
index e40a224404..7075d5cbe3 100644
--- a/bsps/m68k/uC5282/include/bsp.h
+++ b/bsps/m68k/uC5282/include/bsp.h
@@ -7,16 +7,14 @@
  */
 
 /*
- *  uC5282 BSP header file
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  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.
  */
 
 #ifndef LIBBSP_M68K_UC5282_BSP_H
diff --git a/bsps/m68k/uC5282/include/tm27.h b/bsps/m68k/uC5282/include/tm27.h
index 9a24da3755..6d8e2cc344 100644
--- a/bsps/m68k/uC5282/include/tm27.h
+++ b/bsps/m68k/uC5282/include/tm27.h
@@ -5,14 +5,14 @@
  */
 
 /*
- *  Author: W. Eric Norum <norume@aps.anl.gov>
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  COPYRIGHT (c) 2005-2014.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005-2014.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #ifndef _RTEMS_TMTEST27
diff --git a/bsps/m68k/uC5282/start/bspclean.c b/bsps/m68k/uC5282/start/bspclean.c
index a344efd7bb..54e811cfe2 100644
--- a/bsps/m68k/uC5282/start/bspclean.c
+++ b/bsps/m68k/uC5282/start/bspclean.c
@@ -1,14 +1,16 @@
 /*
  *  This routine returns control from RTEMS to the monitor.
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <bsp.h>
diff --git a/bsps/m68k/uC5282/start/bspstart.c b/bsps/m68k/uC5282/start/bspstart.c
index 33ce737ceb..0729778f2b 100644
--- a/bsps/m68k/uC5282/start/bspstart.c
+++ b/bsps/m68k/uC5282/start/bspstart.c
@@ -3,14 +3,14 @@
  */
 
 /*
- *  Author: W. Eric Norum <norume@aps.anl.gov>
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <bsp.h>
diff --git a/bsps/m68k/uC5282/start/init5282.c b/bsps/m68k/uC5282/start/init5282.c
index 201ee58c8e..f032591907 100644
--- a/bsps/m68k/uC5282/start/init5282.c
+++ b/bsps/m68k/uC5282/start/init5282.c
@@ -8,14 +8,14 @@
  */
 
 /*
- *  Author: W. Eric Norum <norume@aps.anl.gov>
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  COPYRIGHT (c) 2005.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 #include <rtems.h>
diff --git a/bsps/m68k/uC5282/start/linkcmds b/bsps/m68k/uC5282/start/linkcmds
index 2111e53036..6e08184120 100644
--- a/bsps/m68k/uC5282/start/linkcmds
+++ b/bsps/m68k/uC5282/start/linkcmds
@@ -1,15 +1,17 @@
 /*
  *  This file contains directives for the GNU linker which are specific
  *  to the Arcturus uC DIMM ColdFire 5282
+ */
+
+/*
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  Author: W. Eric Norum <norume@aps.anl.gov>
- *
- *  COPYRIGHT (c) 2005-2007.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (c) 2005-2007.
+ * On-Line Applications Research Corporation (OAR).
  *
- *  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.
  */
 
 /*