[rtems commit] m68k: replace m68k_isr with rtems_isr
gedare at rtems.org
gedare at rtems.org
Mon Apr 16 17:08:39 UTC 2012
Module: rtems
Branch: master
Commit: 1fec9e0357c3988c4e8587d63d6d694a229dcce2
Changeset: http://git.rtems.org/rtems/commit/?id=1fec9e0357c3988c4e8587d63d6d694a229dcce2
Author: Gedare Bloom <gedare at rtems.org>
Date: Sun Apr 15 22:22:36 2012 -0400
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 +-
c/src/libchip/network/open_eth.c | 4 +---
c/src/libchip/network/sonic.c | 4 ----
cpukit/score/cpu/m68k/rtems/score/types.h | 2 --
36 files changed, 57 insertions(+), 65 deletions(-)
diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/c/src/lib/libbsp/m68k/av5282/include/bsp.h
index b5b5117..84d79b6 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 79e3902..7b6b352 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 5a53d41..2e75297 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 450131e..e0eb9a7 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 7525136..b331ef3 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 a12495b..4b5c858 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 37c7076..207ab1a 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 948767e..dba6f5a 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 d22d585..aace39c 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 ef8d8dc..4235648 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 7139981..a418ee3 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 e494efd..701e604 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 d56c4f6..9f24087 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 b069050..b822b8d 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 88421c1..7a7db3b 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 4488abe..88d2e6c 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 5bdf881..8d73e30 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 1a9054e..e268f56 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 26d8b5b..15d37cb 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 d1b659e..56eea97 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 79dfbe8..8ebbeff 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 ffa2777..46999c3 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 1df77f1..246e4e0 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 cc21805..d8d7544 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 c2b3d4a..a8c7798 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 b043c2c..7dfd0fe 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 7e23b53..5983446 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 5dbd996..5c0ec6a 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 030d648..7e934b5 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 8c14044..1e08d4f 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 90323fb..7142edd 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 4c0702d..3d6b71c 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 47e3797..4365cf3 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
diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c
index 86f7e62..b9d178c 100644
--- a/c/src/libchip/network/open_eth.c
+++ b/c/src/libchip/network/open_eth.c
@@ -55,9 +55,7 @@
#undef free
#endif
-#if defined(__m68k__)
-extern m68k_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
-#elif defined(__lm32__)
+#if defined(__lm32__)
extern lm32_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
#else
extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
diff --git a/c/src/libchip/network/sonic.c b/c/src/libchip/network/sonic.c
index 2abc949..d900757 100644
--- a/c/src/libchip/network/sonic.c
+++ b/c/src/libchip/network/sonic.c
@@ -54,11 +54,7 @@
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#if defined(__m68k__)
-extern m68k_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
-#else
extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
-#endif
#if (SONIC_DEBUG & SONIC_DEBUG_DUMP_MBUFS)
#include <rtems/dumpbuf.h>
diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/rtems/score/types.h
index 0c24425..eb87a6c 100644
--- a/cpukit/score/cpu/m68k/rtems/score/types.h
+++ b/cpukit/score/cpu/m68k/rtems/score/types.h
@@ -32,8 +32,6 @@ extern "C" {
*/
typedef uint16_t Priority_bit_map_Control;
-typedef void m68k_isr;
-typedef void ( *m68k_isr_entry )( void );
#ifdef __cplusplus
}
More information about the vc
mailing list