From 72d092676629f0eb5bc39d595fc2302b762ff43c Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Tue, 8 Jan 2013 10:45:35 -0600
Subject: m68k/mvme167: Compiles again

Was including non-existent .h file.
Fixed some warnings.
Reformatted file header comment blocks.
---
 c/src/lib/libbsp/m68k/mvme167/include/bsp.h      | 11 +++--
 c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c | 19 ++++-----
 c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c | 54 +++++++++---------------
 3 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
index f2521e9118..305787d800 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
@@ -1,11 +1,14 @@
-/*  bsp.h
+/**
+ *  @file
  *
  *  Following defines must reflect the setup of the particular MVME167.
  *  All page references are to the MVME166/MVME167/MVME187 Single Board
  *  Computer Programmer's Reference Guide (MVME187PG/D2) with the April
  *  1993 supplements/addenda (MVME187PG/D2A1).
- *
- *  COPYRIGHT (c) 1989-2009.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2012.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -309,7 +312,7 @@ rtems_isr_entry set_vector(
 #define EXTERN extern
 #endif
 
-extern rtems_isr_entry M68Kvec[];   /* vector table address */
+extern void *M68Kvec[];   /* vector table address */
 
 #ifdef __cplusplus
 }
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c
index 820ffe89ed..4be67fec41 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c
@@ -1,9 +1,12 @@
-/*  bspclean.c
+/** 
+ *  @file
  *
  *  These routines return control to 167Bug after a normal exit from the
  *  application.
- *
- *  COPYRIGHT (c) 1989-2010.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2012.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -21,17 +24,11 @@
 extern void start( void );
 extern void page_table_teardown( void );
 
-/*
- *  bsp_return_to_monitor_trap
+/**
+ *  @brief bsp_return_to_monitor_trap
  *
  *  Switch the VBR back to ROM and make a .RETURN syscall to return control to
  *  167 Bug. If 167Bug ever returns, restart the application.
- *
- *  Input parameters: NONE
- *
- *  Output parameters: NONE
- *
- *  Return values: NONE
  */
 static void bsp_return_to_monitor_trap( void )
 {
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
index 441c8eb38b..2c7f5ebb21 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
@@ -1,30 +1,5 @@
-/*  bspstart.c
- *
- *  This set of routines starts the application. It includes application,
- *  board, and monitor specific initialization and configuration. The generic
- *  CPU dependent initialization has been performed before any of these are
- *  invoked.
- *
- *  COPYRIGHT (c) 1989-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.com/license/LICENSE.
- *
- *  Modifications of respective RTEMS files:
- *  Copyright (c) 1998, National Research Council of Canada
- */
-
-#include <bsp.h>
-#include <page_table.h>
-#include <fatal.h>
-
-void M68KFPSPInstallExceptionHandlers (void);
-extern rtems_isr_entry  M68Kvec[];
-
-/*
- *  bsp_start()
+/**
+ *  @file
  *
  *  Board-specific initialization code. Called from the generic boot_card()
  *  function defined in rtems/c/src/lib/libbsp/shared/main.c. That function
@@ -43,22 +18,35 @@ extern rtems_isr_entry  M68Kvec[];
  *
  *  ASSUMES THAT 167BUG IS PRESENT TO CATCH ANY EXCEPTIONS DURING
  *  INITIALIZATION.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2012.
+ *  On-Line Applications Research Corporation (OAR).
  *
- *  Input parameters: NONE
- *
- *  Output parameters: NONE
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
  *
- *  Return values: NONE
+ *  Modifications of respective RTEMS files:
+ *  Copyright (c) 1998, National Research Council of Canada
  */
+
+#include <bsp.h>
+#include <bsp/bootcard.h>
+#include <page_table.h>
+
+void M68KFPSPInstallExceptionHandlers (void);
+
 void bsp_start( void )
 {
-  rtems_isr_entry *rom_monitor_vector_table;
+  void **rom_monitor_vector_table;
   int index;
 
   /*
    *  167Bug Vectors are at 0xFFE00000
    */
-  rom_monitor_vector_table = (rtems_isr_entry *)0xFFE00000;
+  rom_monitor_vector_table = (void **)0xFFE00000;
   m68k_set_vbr( rom_monitor_vector_table );
 
   /*
-- 
cgit v1.2.3