summaryrefslogtreecommitdiffstats
path: root/bsps/m68k/gen68360
diff options
context:
space:
mode:
Diffstat (limited to 'bsps/m68k/gen68360')
-rw-r--r--bsps/m68k/gen68360/README9
-rw-r--r--bsps/m68k/gen68360/btimer/btimer.c30
-rw-r--r--bsps/m68k/gen68360/clock/clock.c12
-rw-r--r--bsps/m68k/gen68360/console/console.c21
-rw-r--r--bsps/m68k/gen68360/include/bsp.h23
-rw-r--r--bsps/m68k/gen68360/include/tm27.h2
-rw-r--r--bsps/m68k/gen68360/spi/m360_spi.c31
-rw-r--r--bsps/m68k/gen68360/spi/m360_spi.h42
-rw-r--r--bsps/m68k/gen68360/start/alloc360.c10
-rw-r--r--bsps/m68k/gen68360/start/init68360.c6
-rw-r--r--bsps/m68k/gen68360/start/linkcmds2
-rw-r--r--bsps/m68k/gen68360/start/linkcmds.bootp2
-rw-r--r--bsps/m68k/gen68360/start/linkcmds.prom2
-rw-r--r--bsps/m68k/gen68360/start/start.S25
14 files changed, 90 insertions, 127 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..07da6a034d 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>
@@ -35,7 +33,7 @@ static unsigned long nsec;
* Application code can override this by
* setting M360DefaultWatchdogFeeder to zero.
*/
-#define Clock_driver_support_at_tick() \
+#define Clock_driver_support_at_tick(arg) \
do { \
nsec += pit_nsec_per_tick; \
if (nsec >= rtems_nsec_per_tick) \
diff --git a/bsps/m68k/gen68360/console/console.c b/bsps/m68k/gen68360/console/console.c
index 36d8470168..a2292dbab9 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>
@@ -313,7 +308,7 @@ rtems_device_driver console_open(
smc1SetAttributes, /* setAttributes */
NULL, /* stopRemoteTx */
NULL, /* startRemoteTx */
- 1 /* outputUsesInterrupts */
+ TERMIOS_IRQ_DRIVEN /* outputUsesInterrupts */
};
static const rtems_termios_callbacks pollCallbacks = {
smc1Initialize, /* firstOpen */
@@ -323,7 +318,7 @@ rtems_device_driver console_open(
smc1SetAttributes, /* setAttributes */
NULL, /* stopRemoteTx */
NULL, /* startRemoteTx */
- 0 /* outputUsesInterrupts */
+ TERMIOS_POLLED /* outputUsesInterrupts */
};
/*
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/include/tm27.h b/bsps/m68k/gen68360/include/tm27.h
index 5523a4a345..6134f15d68 100644
--- a/bsps/m68k/gen68360/include/tm27.h
+++ b/bsps/m68k/gen68360/include/tm27.h
@@ -29,6 +29,8 @@
#define MUST_WAIT_FOR_INTERRUPT 0
+#define TM27_USE_VECTOR_HANDLER
+
#define Install_tm27_vector( handler ) set_vector( (handler), 34, 1 )
#define Cause_tm27_intr() asm volatile ("trap #2");
diff --git a/bsps/m68k/gen68360/spi/m360_spi.c b/bsps/m68k/gen68360/spi/m360_spi.c
index f60b5b6a51..07bcdf8daf 100644
--- a/bsps/m68k/gen68360/spi/m360_spi.c
+++ b/bsps/m68k/gen68360/spi/m360_spi.c
@@ -1,21 +1,16 @@
-/*===============================================================*\
-| Project: RTEMS support for PGH360 |
-+-----------------------------------------------------------------+
-| Copyright (c) 2008 |
-| Embedded Brains GmbH |
-| Obere Lagerstr. 30 |
-| D-82178 Puchheim |
-| Germany |
-| rtems@embedded-brains.de |
-+-----------------------------------------------------------------+
-| 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. |
-| |
-+-----------------------------------------------------------------+
-| this file contains the M360 SPI driver |
-\*===============================================================*/
+/*
+ * This file contains the M360 SPI driver
+ */
+
+/*
+ * Copyright (c) 2008 Embedded Brains GmbH. All rights reserved.
+ *
+ *
+ * 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 <stdlib.h>
#include <bsp.h>
#include <rtems/m68k/m68360.h>
diff --git a/bsps/m68k/gen68360/spi/m360_spi.h b/bsps/m68k/gen68360/spi/m360_spi.h
index 1a18707fe9..a470f3786a 100644
--- a/bsps/m68k/gen68360/spi/m360_spi.h
+++ b/bsps/m68k/gen68360/spi/m360_spi.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
/**
* @file
*
@@ -6,22 +8,30 @@
* @brief this file contains the MC68360 SPI driver declarations
*/
-/*===============================================================*\
-| Project: RTEMS support for MC68360 |
-+-----------------------------------------------------------------+
-| Copyright (c) 2008 |
-| Embedded Brains GmbH |
-| Obere Lagerstr. 30 |
-| D-82178 Puchheim |
-| Germany |
-| rtems@embedded-brains.de |
-+-----------------------------------------------------------------+
-| 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) 2008 embedded brains GmbH & Co. KG
+ *
+ * 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.
+ */
/**
* @defgroup m68k_m360spi M360_SPIDRV Support
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/linkcmds b/bsps/m68k/gen68360/start/linkcmds
index 0bf9efa9ea..7376ce070c 100644
--- a/bsps/m68k/gen68360/start/linkcmds
+++ b/bsps/m68k/gen68360/start/linkcmds
@@ -154,7 +154,7 @@ SECTIONS {
} >ram
.noinit (NOLOAD) : {
- *(.noinit*)
+ *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
} > ram
.rtemsstack (NOLOAD) : {
diff --git a/bsps/m68k/gen68360/start/linkcmds.bootp b/bsps/m68k/gen68360/start/linkcmds.bootp
index 422396f766..4bca5aab54 100644
--- a/bsps/m68k/gen68360/start/linkcmds.bootp
+++ b/bsps/m68k/gen68360/start/linkcmds.bootp
@@ -156,7 +156,7 @@ SECTIONS {
} >myram
.noinit (NOLOAD) : {
- *(.noinit*)
+ *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
} >mvram
.rtemsstack (NOLOAD) : {
diff --git a/bsps/m68k/gen68360/start/linkcmds.prom b/bsps/m68k/gen68360/start/linkcmds.prom
index da8acdf376..c5c96228a4 100644
--- a/bsps/m68k/gen68360/start/linkcmds.prom
+++ b/bsps/m68k/gen68360/start/linkcmds.prom
@@ -154,7 +154,7 @@ SECTIONS {
} >ram
.noinit (NOLOAD) : {
- *(.noinit*)
+ *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
} > ram
.rtemsstack (NOLOAD) : {
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 17:10:17 +0000