diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-14 14:58:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-14 14:58:23 +0000 |
| commit | 24af51c5e9b7f2495c051e3947b2ca76d607c02e (patch) | |
| tree | d498a51fb9f6adf86fd3e7196a19391de7baa176 /c | |
| parent | 2007-09-14 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-24af51c5e9b7f2495c051e3947b2ca76d607c02e.tar.bz2 | |
2007-09-14 Daron Chabot <djc915@mail.usask.ca>
* libchip/network/if_dc.c: Changed type of ISR argument to void* from
rtems_interrupt_vector, to permit passing arbitrary arguments to the
ISR. Clean up of variables to silence compiler warnings.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/libchip/network/if_dc.c | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index c9e06ed8cf..e91a7292d9 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2007-09-14 Daron Chabot <djc915@mail.usask.ca> + + * libchip/network/if_dc.c: Changed type of ISR argument to void* from + rtems_interrupt_vector, to permit passing arbitrary arguments to the + ISR. Clean up of variables to silence compiler warnings. + 2007-09-13 Daniel Hellstrom <daniel@gaisler.com> * libchip/network/smc91111.c: Eliminate a stray DEBUG_puts(). diff --git a/c/src/libchip/network/if_dc.c b/c/src/libchip/network/if_dc.c index b35b7f677f..e28ecef4a4 100644 --- a/c/src/libchip/network/if_dc.c +++ b/c/src/libchip/network/if_dc.c @@ -291,7 +291,7 @@ static void dc_rxeof(struct dc_softc *); static void dc_txeof(struct dc_softc *); /*static void dc_tick((void *));*/ static void dc_tx_underrun(struct dc_softc *); -static rtems_isr dc_intr(rtems_vector_number); +static void dc_intr(void *); static void dc_daemon(void *); static void dc_start(struct ifnet *); static int dc_ioctl(struct ifnet *, ioctl_command_t, caddr_t); @@ -1604,7 +1604,7 @@ static struct dc_type *dc_devtype( int unitnum ) { struct dc_type *t; - uint32_t rev; + unsigned int rev; int rc; @@ -1908,13 +1908,13 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching) char *unitName; int unitNumber; - uint32_t command; + unsigned int command; struct dc_softc *sc; struct ifnet *ifp; struct dc_type *t; - uint32_t revision; + unsigned int revision; int error = 0, mac_offset; - uint32_t value; + unsigned int value; /* * Get the instance number for the board we're going to configure @@ -3108,10 +3108,10 @@ dc_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) #endif /* DEVICE_POLLING */ static void -dc_intr(rtems_vector_number v) +dc_intr(void* arg) { /* Need to make this work for multiple devices ... eventually */ - struct dc_softc *sc = &dc_softc_devs[0]; + struct dc_softc *sc = (struct dc_softc *)arg; /* Disable interrupts. */ |