From 1fec9e0357c3988c4e8587d63d6d694a229dcce2 Mon Sep 17 00:00:00 2001
From: Gedare Bloom <gedare@rtems.org>
Date: Sun, 15 Apr 2012 22:22:36 -0400
Subject: m68k: replace m68k_isr with rtems_isr

---
 c/src/lib/libbsp/m68k/av5282/include/bsp.h         | 2 +-
 c/src/lib/libbsp/m68k/csb360/include/bsp.h         | 4 ++--
 c/src/lib/libbsp/m68k/gen68302/include/bsp.h       | 4 ++--
 c/src/lib/libbsp/m68k/gen68340/include/bsp.h       | 4 ++--
 c/src/lib/libbsp/m68k/gen68340/startup/init68340.c | 2 +-
 c/src/lib/libbsp/m68k/gen68360/include/bsp.h       | 4 ++--
 c/src/lib/libbsp/m68k/gen68360/startup/init68360.c | 2 +-
 c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h     | 2 +-
 c/src/lib/libbsp/m68k/idp/include/bsp.h            | 4 ++--
 c/src/lib/libbsp/m68k/idp/startup/bspstart.c       | 4 ++--
 c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h   | 4 ++--
 c/src/lib/libbsp/m68k/mcf52235/include/bsp.h       | 2 +-
 c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h       | 2 +-
 c/src/lib/libbsp/m68k/mcf5235/include/bsp.h        | 2 +-
 c/src/lib/libbsp/m68k/mcf5329/include/bsp.h        | 2 +-
 c/src/lib/libbsp/m68k/mrm332/include/bsp.h         | 4 ++--
 c/src/lib/libbsp/m68k/mrm332/start/start.S         | 2 +-
 c/src/lib/libbsp/m68k/mrm332/startup/start_c.c     | 6 +++---
 c/src/lib/libbsp/m68k/mvme136/include/bsp.h        | 4 ++--
 c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c   | 4 ++--
 c/src/lib/libbsp/m68k/mvme147/include/bsp.h        | 4 ++--
 c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c   | 4 ++--
 c/src/lib/libbsp/m68k/mvme147s/include/bsp.h       | 4 ++--
 c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c  | 4 ++--
 c/src/lib/libbsp/m68k/mvme162/README               | 2 +-
 c/src/lib/libbsp/m68k/mvme162/include/bsp.h        | 4 ++--
 c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c   | 4 ++--
 c/src/lib/libbsp/m68k/mvme167/include/bsp.h        | 4 ++--
 c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c   | 6 +++---
 c/src/lib/libbsp/m68k/ods68302/include/bsp.h       | 4 ++--
 c/src/lib/libbsp/m68k/shared/setvec.c              | 4 ++--
 c/src/lib/libbsp/m68k/sim68000/include/bsp.h       | 2 +-
 c/src/lib/libbsp/m68k/uC5282/include/bsp.h         | 2 +-
 33 files changed, 56 insertions(+), 56 deletions(-)

(limited to 'c/src/lib/libbsp')

diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/c/src/lib/libbsp/m68k/av5282/include/bsp.h
index b5b511777e..84d79b6237 100644
--- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/av5282/include/bsp.h
@@ -43,7 +43,7 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at
 
 uint32_t get_CPU_clock_speed(void);
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
index 79e3902f1a..7b6b352dd0 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
@@ -151,13 +151,13 @@ extern rtems_device_driver rtc_initialize(
 
 /* miscellaneous stuff assumed to exist */
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 extern rtems_isr (*rtems_clock_hook)(rtems_vector_number);
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
index 5a53d41b3f..2e75297b09 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
@@ -61,11 +61,11 @@ extern "C" {
 
 /* miscellaneous stuff assumed to exist */
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index 450131e727..e0eb9a7337 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
@@ -51,11 +51,11 @@ extern "C" {
 
 /* Structures */
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c b/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c
index 7525136488..b331ef3a59 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c
@@ -22,7 +22,7 @@ extern void _CopyDataClearBSSAndStart (void);
  */
 void _Init68340 (void)
 {
-	m68k_isr_entry *vbr;
+	rtems_isr_entry *vbr;
 	int i;
 
 	/*
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
index a12495b63b..4b5c8588f0 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
@@ -61,7 +61,7 @@ extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config, int a
                   : "0"  (_tmp), "1"  (_delay) ); \
   }
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
@@ -72,7 +72,7 @@ extern char M360DefaultWatchdogFeeder;
 
 extern int m360_clock_rate; /* BRG clock rate, defined in console.c */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
index 37c7076733..207ab1abea 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
@@ -45,7 +45,7 @@ void M360ExecuteRISC(uint16_t         command)
 void _Init68360 (void)
 {
 	int i;
-	m68k_isr_entry *vbr;
+	rtems_isr_entry *vbr;
 	unsigned long ramSize;
 	volatile unsigned long *RamBase_p;
 
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
index 948767e69f..dba6f5ae4c 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
@@ -81,7 +81,7 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at
 
 uint32_t get_CPU_clock_speed(void);
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h
index d22d585e88..aace39c825 100644
--- a/c/src/lib/libbsp/m68k/idp/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h
@@ -23,11 +23,11 @@
 #define RAM_START 0
 #define RAM_END   0x200000
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
index ef8d8dc5de..423564809d 100644
--- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
@@ -30,7 +30,7 @@ void led_putnum(void);
  */
 void bsp_start( void )
 {
-  m68k_isr_entry       *monitors_vector_table;
+  rtems_isr_entry       *monitors_vector_table;
   int                   index;
 
   /* RAM size set in linker script */
@@ -39,7 +39,7 @@ void bsp_start( void )
   /*
    *  Set the VBR here to the monitor's default.
    */
-  monitors_vector_table = (m68k_isr_entry *)0;
+  monitors_vector_table = (rtems_isr_entry *)0;
    /* This is where you set vector base register = 0 */
   m68k_set_vbr( monitors_vector_table );
 
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
index 7139981e12..a418ee3006 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
@@ -162,13 +162,13 @@ extern char _SYS_CLOCK_FREQUENCY; /* Don't use this variable directly!!! */
   }
 
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 extern rtems_isr (*rtems_clock_hook)(rtems_vector_number);
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
index e494efd48e..701e604327 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
@@ -43,7 +43,7 @@ extern "C" {
 
 uint32_t bsp_get_CPU_clock_speed(void);
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
index d56c4f65ce..9f24087542 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
@@ -64,7 +64,7 @@ extern "C" {
 
 uint32_t bsp_get_CPU_clock_speed(void);
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
index b069050fdd..b822b8d59a 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
@@ -37,7 +37,7 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at
 /* functions */
 
 uint32_t get_CPU_clock_speed(void);
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
index 88421c15e1..7a7db3b575 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
@@ -43,7 +43,7 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at
 uint32_t bsp_get_CPU_clock_speed(void);
 uint32_t bsp_get_BUS_clock_speed(void);
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index 4488abec50..88d2e6c94a 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -86,14 +86,14 @@ extern char _copy_data_from_rom[];
 
 /* miscellaneous stuff assumed to exist */
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 extern int stack_size;
 extern int stack_start;
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mrm332/start/start.S b/c/src/lib/libbsp/m68k/mrm332/start/start.S
index 5bdf88124b..8d73e308a0 100644
--- a/c/src/lib/libbsp/m68k/mrm332/start/start.S
+++ b/c/src/lib/libbsp/m68k/mrm332/start/start.S
@@ -120,7 +120,7 @@ END_CODE
    * Initialize vector table.
    */
   {
-    m68k_isr_entry *monitors_vector_table;
+    rtems_isr_entry *monitors_vector_table;
 
     m68k_get_vbr(monitors_vector_table);
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c b/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
index 1a9054e2e1..e268f56fe9 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
+++ b/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
@@ -7,8 +7,8 @@
 #define __START_C__
 #include "bsp.h"
 
-m68k_isr_entry M68Kvec[256];
-m68k_isr_entry vectors[256];
+rtems_isr_entry M68Kvec[256];
+rtems_isr_entry vectors[256];
 
 void  boot_card(const char *cmdline);
 
@@ -94,7 +94,7 @@ void start_c(void) {
    * Initialize vector table.
    */
   {
-    m68k_isr_entry *monitors_vector_table;
+    rtems_isr_entry *monitors_vector_table;
 
     m68k_get_vbr(monitors_vector_table);
 
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
index 26d8b5bb70..15d37cb4cb 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
@@ -80,11 +80,11 @@ struct w_m681_info {
   char ivr;                              /* interrupt vector register */
 };
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
index d1b659e194..56eea977e4 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
@@ -24,10 +24,10 @@
  */
 void bsp_start( void )
 {
-  m68k_isr_entry *monitors_vector_table;
+  rtems_isr_entry *monitors_vector_table;
   int             index;
 
-  monitors_vector_table = (m68k_isr_entry *)0;   /* 135Bug Vectors are at 0 */
+  monitors_vector_table = (rtems_isr_entry *)0;   /* 135Bug Vectors are at 0 */
   m68k_set_vbr( monitors_vector_table );
 
   for ( index=2 ; index<=255 ; index++ )
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
index 79dfbe8c25..8ebbeffcfe 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
@@ -104,11 +104,11 @@ struct pcc_map {
 #define CONSOLE_DATA     0xfffe3001
 #endif
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
index ffa27778fe..46999c3715 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
@@ -28,10 +28,10 @@
 
 void bsp_start( void )
 {
-  m68k_isr_entry       *monitors_vector_table;
+  rtems_isr_entry       *monitors_vector_table;
   int                   index;
 
-  monitors_vector_table = (m68k_isr_entry *)0;   /* 135Bug Vectors are at 0 */
+  monitors_vector_table = (rtems_isr_entry *)0;   /* 135Bug Vectors are at 0 */
   m68k_set_vbr( monitors_vector_table );
 
   for ( index=2 ; index<=255 ; index++ )
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
index 1df77f1f8f..246e4e0126 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
@@ -175,7 +175,7 @@ struct vme_gcsr_map {
 #define EXTERN extern
 #endif
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /*
  * NOTE: Use the standard Clock driver entry
@@ -183,7 +183,7 @@ extern m68k_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
index cc21805b25..d8d7544b4c 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
@@ -27,11 +27,11 @@
  */
 void bsp_start( void )
 {
-  m68k_isr_entry       *monitors_vector_table;
+  rtems_isr_entry       *monitors_vector_table;
   int                   index;
   uint8_t               node_number;
 
-  monitors_vector_table = (m68k_isr_entry *)0;   /* 147Bug Vectors are at 0 */
+  monitors_vector_table = (rtems_isr_entry *)0;   /* 147Bug Vectors are at 0 */
   m68k_set_vbr( monitors_vector_table );
 
   for ( index=2 ; index<=255 ; index++ )
diff --git a/c/src/lib/libbsp/m68k/mvme162/README b/c/src/lib/libbsp/m68k/mvme162/README
index c2b3d4a7ca..a8c7798a07 100644
--- a/c/src/lib/libbsp/m68k/mvme162/README
+++ b/c/src/lib/libbsp/m68k/mvme162/README
@@ -114,7 +114,7 @@ configured for the board in use
 
 - bspstart.c was modified as follows:
 
-         monitors_vector_table = (m68k_isr *)0xFFE00000;
+         monitors_vector_table = (rtems_isr *)0xFFE00000;
 
 was made to point to the power-up location of MVME162 interrupt vector
 table.  
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
index b043c2c73f..7dfd0fe1a2 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
@@ -185,11 +185,11 @@ typedef volatile struct {
  */
 #define MOT_162BUG_VEC_ADDRESS  0x00000000
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
index 7e23b53f8f..598344675f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
@@ -31,10 +31,10 @@
  */
 void bsp_start( void )
 {
-  m68k_isr_entry       *monitors_vector_table;
+  rtems_isr_entry       *monitors_vector_table;
   int                   index;
 
-  monitors_vector_table = (m68k_isr_entry *)MOT_162BUG_VEC_ADDRESS;
+  monitors_vector_table = (rtems_isr_entry *)MOT_162BUG_VEC_ADDRESS;
   m68k_set_vbr( monitors_vector_table );
 
   for ( index=2 ; index<=255 ; index++ )
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
index 5dbd996843..5c0ec6a3b0 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
@@ -296,7 +296,7 @@ typedef volatile struct cd2401_regs_ {
 
 /* BSP-wide functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
@@ -310,7 +310,7 @@ m68k_isr_entry set_vector(
 #define EXTERN extern
 #endif
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 #ifdef __cplusplus
 }
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
index 030d648414..7e934b5257 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
@@ -26,7 +26,7 @@
 rtems_extensions_table user_extension_table;
 
 void M68KFPSPInstallExceptionHandlers (void);
-extern m68k_isr_entry  M68Kvec[];
+extern rtems_isr_entry  M68Kvec[];
 
 /*
  *  bsp_start()
@@ -57,13 +57,13 @@ extern m68k_isr_entry  M68Kvec[];
  */
 void bsp_start( void )
 {
-  m68k_isr_entry *rom_monitor_vector_table;
+  rtems_isr_entry *rom_monitor_vector_table;
   int index;
 
   /*
    *  167Bug Vectors are at 0xFFE00000
    */
-  rom_monitor_vector_table = (m68k_isr_entry *)0xFFE00000;
+  rom_monitor_vector_table = (rtems_isr_entry *)0xFFE00000;
   m68k_set_vbr( rom_monitor_vector_table );
 
   /*
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
index 8c140445a5..1e08d4f6a6 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
@@ -68,11 +68,11 @@ extern "C" {
 #define EXTERN extern
 #endif
 
-extern m68k_isr_entry M68Kvec[];   /* vector table address */
+extern rtems_isr_entry M68Kvec[];   /* vector table address */
 
 /* functions */
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
diff --git a/c/src/lib/libbsp/m68k/shared/setvec.c b/c/src/lib/libbsp/m68k/shared/setvec.c
index 90323fbd51..7142edd5ef 100644
--- a/c/src/lib/libbsp/m68k/shared/setvec.c
+++ b/c/src/lib/libbsp/m68k/shared/setvec.c
@@ -20,7 +20,7 @@
 #include <rtems.h>
 #include <bsp.h>
 
-m68k_isr_entry set_vector(                      /* returns old vector */
+rtems_isr_entry set_vector(                      /* returns old vector */
   rtems_isr_entry     handler,                  /* isr routine        */
   rtems_vector_number vector,                   /* vector number      */
   int                 type                      /* RTEMS or RAW intr  */
@@ -33,5 +33,5 @@ m68k_isr_entry set_vector(                      /* returns old vector */
   else {
     _CPU_ISR_install_raw_handler( vector, handler, (void *)&previous_isr );
   }
-  return (m68k_isr_entry) previous_isr;
+  return (rtems_isr_entry) previous_isr;
 }
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
index 4c0702d0da..3d6b71cc84 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
@@ -50,7 +50,7 @@ extern "C" {
 
 /* functions */
 
-m68k_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
+rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
 
 #ifdef __cplusplus
 }
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
index 47e379781f..4365cf33d4 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
@@ -71,7 +71,7 @@ const char *bsp_getbenv(const char *a);
 int bsp_flash_erase_range(volatile unsigned short *flashptr, int start, int end);
 int bsp_flash_write_range(volatile unsigned short *flashptr, bsp_mnode_t *chain, int offset);
 
-m68k_isr_entry set_vector(
+rtems_isr_entry set_vector(
   rtems_isr_entry     handler,
   rtems_vector_number vector,
   int                 type
-- 
cgit v1.2.3