diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2009-02-20 16:15:15 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2009-02-20 16:15:15 +0000 |
| commit | 881e3881af7e0dc1f12230601460c6a73836b63c (patch) | |
| tree | c6d9a63e38de2e37c7b484104961c5ac2d783d80 /bsd_eth_drivers/if_re/if_re.c | |
| parent | 2009-02-20 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | libbsdport-881e3881af7e0dc1f12230601460c6a73836b63c.tar.bz2 | |
- fixed arguments to bus_setup_intr(); 're_intr' is really what
the newer API calls a 'filter' -- however, it must be equipped
with a proper return value.
- as long as MII stuff is not implememented we fake an OK link
by setting rl_link=1.
- removed re_intr_check_dis(), re_intr_en()
Diffstat (limited to 'bsd_eth_drivers/if_re/if_re.c')
| -rw-r--r-- | bsd_eth_drivers/if_re/if_re.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/bsd_eth_drivers/if_re/if_re.c b/bsd_eth_drivers/if_re/if_re.c index 1ed5364..5b6b449 100644 --- a/bsd_eth_drivers/if_re/if_re.c +++ b/bsd_eth_drivers/if_re/if_re.c @@ -260,7 +260,11 @@ static void re_txeof (struct rl_softc *); static void re_poll (struct ifnet *, enum poll_cmd, int); static void re_poll_locked (struct ifnet *, enum poll_cmd, int); #endif +#ifdef __rtems__ +static int re_intr (void *); +#else static void re_intr (void *); +#endif static void re_tick (void *); static void re_tx_task (void *, int); static void re_int_task (void *, int); @@ -353,6 +357,8 @@ static device_method_t re_methods = { attach: re_attach, shutdown: re_shutdown, detach: re_detach, + irq_check_dis: 0, + irq_en: 0, }; driver_t libbsdport_re_driver = { @@ -362,7 +368,6 @@ driver_t libbsdport_re_driver = { sizeof(struct rl_softc) }; - #endif #define EE_SET(x) \ @@ -1999,7 +2004,10 @@ re_tick(xsc) &sc->rl_txtask); } } - +#else +#warning "MII stuff needs to be implemented!" + /* Just fake an OK link for now... */ + sc->rl_link = 1; #endif callout_reset(&sc->rl_stat_callout, hz, re_tick, sc); } @@ -2051,7 +2059,11 @@ re_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count) } #endif /* DEVICE_POLLING */ +#ifdef __rtems__ +static int +#else static void +#endif re_intr(arg) void *arg; { @@ -2062,12 +2074,20 @@ re_intr(arg) status = CSR_READ_2(sc, RL_ISR); if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0) +#ifdef __rtems__ + return FILTER_STRAY; +#else return; +#endif CSR_WRITE_2(sc, RL_IMR, 0); taskqueue_enqueue_fast(taskqueue_fast, &sc->rl_inttask); +#ifdef __rtems__ + return FILTER_HANDLED; +#else return; +#endif } static void |