summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2004-03-05 15:30:57 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2004-03-05 15:30:57 +0000
commit30529eb7a51a57d0c947f3b4b615b29383db0ee5 (patch)
tree4d2ebddd9b4fe9bba406260de46f89c73e3f4392
parent2004-02-26 Andreas Karlsson <andreas.karlsson@space.se> (diff)
downloadrtems-30529eb7a51a57d0c947f3b4b615b29383db0ee5.tar.bz2
2004-03-05 Joel Sherrill <joel@OARcorp.com>
PR 505/bsps * setvec.c: Rework to remove punned pointer warning generated by gcc 3.3 and newer.
-rw-r--r--c/src/lib/libbsp/m68k/shared/ChangeLog6
-rw-r--r--c/src/lib/libbsp/m68k/shared/setvec.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/m68k/shared/ChangeLog b/c/src/lib/libbsp/m68k/shared/ChangeLog
index 5aeb0f8759..a8fb6c08cb 100644
--- a/c/src/lib/libbsp/m68k/shared/ChangeLog
+++ b/c/src/lib/libbsp/m68k/shared/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-05 Joel Sherrill <joel@OARcorp.com>
+
+ PR 505/bsps
+ * setvec.c: Rework to remove punned pointer warning generated by gcc
+ 3.3 and newer.
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* bspspuriousinit.c, m68000spurious.c, m68kpretaskinghook.c, setvec.c,
diff --git a/c/src/lib/libbsp/m68k/shared/setvec.c b/c/src/lib/libbsp/m68k/shared/setvec.c
index 93b5cee166..3f09eba112 100644
--- a/c/src/lib/libbsp/m68k/shared/setvec.c
+++ b/c/src/lib/libbsp/m68k/shared/setvec.c
@@ -26,13 +26,13 @@ m68k_isr_entry set_vector( /* returns old vector */
int type /* RTEMS or RAW intr */
)
{
- m68k_isr_entry previous_isr;
+ rtems_isr_entry previous_isr;
if ( type )
- rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr );
+ rtems_interrupt_catch( handler, vector, &previous_isr );
else {
_CPU_ISR_install_raw_handler( vector, handler, (void *)&previous_isr );
}
- return previous_isr;
+ return (m68k_isr_entry) previous_isr;
}