diff options
| author | Jay Monkman <jtm@smoothsmoothie.com> | 2006-06-03 03:04:41 +0000 |
|---|---|---|
| committer | Jay Monkman <jtm@smoothsmoothie.com> | 2006-06-03 03:04:41 +0000 |
| commit | 9c05850cb2825b6b80e3dc155db298609521d5cb (patch) | |
| tree | c07eff8d856a8f634aa54ca87a25eb4972b9f8b2 /c | |
| parent | Formatting. (diff) | |
| download | rtems-9c05850cb2825b6b80e3dc155db298609521d5cb.tar.bz2 | |
2006-06-02 Jay Monkman
* network/network.c: Changed interrupt handling
to use shared rtems_irq_connect_data struct.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/network/network.c | 25 |
2 files changed, 18 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index e4e1eba35f..b7e7269adb 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Jay Monkman + + * network/network.c: Changed interrupt handling + to use shared rtems_irq_connect_data struct. + 2006-06-02 Jay Monkman <jtm@lopingdog.com> * start/start.S, startup/linkcmds: Defined UNDEF exception diff --git a/c/src/lib/libbsp/arm/csb336/network/network.c b/c/src/lib/libbsp/arm/csb336/network/network.c index a273934496..3ae4cbe7f8 100644 --- a/c/src/lib/libbsp/arm/csb336/network/network.c +++ b/c/src/lib/libbsp/arm/csb336/network/network.c @@ -41,20 +41,20 @@ /* RTEMS event used to start transmit daemon. */ #define START_TRANSMIT_EVENT RTEMS_EVENT_2 -static rtems_isr enet_isr(rtems_vector_number vector); +static void enet_isr(rtems_irq_hdl_param); static void enet_isr_on(const rtems_irq_connect_data *unused); static void enet_isr_off(const rtems_irq_connect_data *unused); static int enet_isr_is_on(const rtems_irq_connect_data *irq); /* Replace the first value with the clock's interrupt name. */ -rtems_irq_connect_data mc9328mxl_enet_isr_data = {BSP_INT_GPIO_PORTA, - (rtems_irq_hdl)enet_isr, - enet_isr_on, - enet_isr_off, - enet_isr_is_on, - 3, /* unused for ARM */ - 0 }; /* unused for ARM */ - +rtems_irq_connect_data mc9328mxl_enet_isr_data = { + .name = BSP_INT_GPIO_PORTA, + .hdl = (rtems_irq_hdl)enet_isr, + .handle = (void *)BSP_INT_GPIO_PORTA, + .on = enet_isr_on, + .off = enet_isr_off, + .isOn = enet_isr_is_on, +}; typedef struct { unsigned long rx_packets; /* total packets received */ unsigned long tx_packets; /* total packets transmitted */ @@ -102,7 +102,8 @@ void mc9328mxl_enet_tx_task (void *arg); void mc9328mxl_enet_sendpacket (struct ifnet *ifp, struct mbuf *m); void mc9328mxl_enet_rx_task(void *arg); void mc9328mxl_enet_stats(mc9328mxl_enet_softc_t *sc); -static int mc9328mxl_enet_ioctl(struct ifnet *ifp, int command, caddr_t data); +static int mc9328mxl_enet_ioctl(struct ifnet *ifp, + unsigned long command, caddr_t data); int rtems_mc9328mxl_enet_attach ( @@ -631,7 +632,7 @@ static int enet_isr_is_on(const rtems_irq_connect_data *irq) /* Driver ioctl handler */ static int -mc9328mxl_enet_ioctl (struct ifnet *ifp, int command, caddr_t data) +mc9328mxl_enet_ioctl (struct ifnet *ifp, unsigned long command, caddr_t data) { mc9328mxl_enet_softc_t *sc = ifp->if_softc; int error = 0; @@ -678,7 +679,7 @@ mc9328mxl_enet_ioctl (struct ifnet *ifp, int command, caddr_t data) } /* interrupt handler */ -rtems_isr enet_isr (rtems_vector_number v) +static void enet_isr(rtems_irq_hdl_param unused) { uint16_t int_reg; |