From 7f247f3c2593c53a1d9236331ceaaea3951309c7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 4 Sep 2006 13:00:15 +0000 Subject: 2006-09-04 Joel Sherrill * libchip/network/greth.c, libchip/network/open_eth.c, libchip/network/smc91111.c, libchip/network/sonic.c: Fix error introduced by warning removal. --- c/src/ChangeLog | 6 ++++++ c/src/libchip/network/greth.c | 4 ++++ c/src/libchip/network/open_eth.c | 4 ++++ c/src/libchip/network/smc91111.c | 6 ++++++ c/src/libchip/network/sonic.c | 10 +++++----- 5 files changed, 25 insertions(+), 5 deletions(-) (limited to 'c') diff --git a/c/src/ChangeLog b/c/src/ChangeLog index c539b31a86..36d12c8716 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2006-09-04 Joel Sherrill + + * libchip/network/greth.c, libchip/network/open_eth.c, + libchip/network/smc91111.c, libchip/network/sonic.c: Fix error + introduced by warning removal. + 2006-09-01 Joel Sherrill * libchip/network/greth.c, libchip/network/open_eth.c, diff --git a/c/src/libchip/network/greth.c b/c/src/libchip/network/greth.c index 6e0bab6eb3..d27b52f356 100644 --- a/c/src/libchip/network/greth.c +++ b/c/src/libchip/network/greth.c @@ -41,7 +41,11 @@ #undef free #endif +#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 /* #define GRETH_DEBUG diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c index 00c12b1680..3844be978d 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -55,7 +55,11 @@ #undef free #endif +#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 /* #define OPEN_ETH_DEBUG diff --git a/c/src/libchip/network/smc91111.c b/c/src/libchip/network/smc91111.c index ee75c8ab3a..8cbe3c4544 100644 --- a/c/src/libchip/network/smc91111.c +++ b/c/src/libchip/network/smc91111.c @@ -58,6 +58,12 @@ #include "smc91111config.h" #include +#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 + struct lan91cxx_priv_data smc91111; int lan91cxx_hardware_init(struct lan91cxx_priv_data *cpd); diff --git a/c/src/libchip/network/sonic.c b/c/src/libchip/network/sonic.c index 6cfb60d247..cbc1b4a411 100644 --- a/c/src/libchip/network/sonic.c +++ b/c/src/libchip/network/sonic.c @@ -54,11 +54,11 @@ #include #include -/* - * XXX fix this - */ - -void *set_vector(void *, uint32_t, uint32_t); +#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 -- cgit v1.2.3