From c6200d4263b680dca3b32804fe36fb09d8d1b2c2 Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Tue, 3 May 2005 14:14:25 +0000 Subject: 2005-05-03 Jennifer Averett * clock/ckinit.c, console/console.c: Added support for addition of parameter to ISRs. * network/network.c: Modified parameter list to remove warnings. --- c/src/lib/libbsp/i386/i386ex/ChangeLog | 7 +++++++ c/src/lib/libbsp/i386/i386ex/clock/ckinit.c | 3 ++- c/src/lib/libbsp/i386/i386ex/console/console.c | 1 + c/src/lib/libbsp/i386/i386ex/network/network.c | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 2ceabe61ff..2d77bd18b8 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,10 @@ +2005-05-03 Jennifer Averett + + * clock/ckinit.c, console/console.c: Added support for + addition of parameter to ISRs. + * network/network.c: Modified parameter list to remove + warnings. + 2005-04-15 Joel Sherrill * network/network.c: Fix warnings. diff --git a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c index 21600b37f4..5cd51715d2 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c +++ b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c @@ -78,7 +78,8 @@ int ClockIsOn(const rtems_irq_connect_data* unused) static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER, Clock_isr, - ClockOn, + 0, + ClockOn, ClockOff, ClockIsOn}; diff --git a/c/src/lib/libbsp/i386/i386ex/console/console.c b/c/src/lib/libbsp/i386/i386ex/console/console.c index d8dce2c2a1..6000f8499d 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/console.c +++ b/c/src/lib/libbsp/i386/i386ex/console/console.c @@ -70,6 +70,7 @@ static int isr_is_on(const rtems_irq_connect_data *); static rtems_irq_connect_data console_isr_data = { BSP_UART_COM2_IRQ, BSP_uart_termios_isr_com2, + 0, isr_on, isr_off, isr_is_on}; diff --git a/c/src/lib/libbsp/i386/i386ex/network/network.c b/c/src/lib/libbsp/i386/i386ex/network/network.c index 75b1898124..f630342297 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/network.c +++ b/c/src/lib/libbsp/i386/i386ex/network/network.c @@ -112,7 +112,7 @@ void uti596_init (void * ); int uti596initRxBufs (int num); int uti596_initRFA (int num); int uti596initRxBufs (int num); -static int uti596_ioctl (struct ifnet *, int, caddr_t); +static int uti596_ioctl (struct ifnet *, u_long, caddr_t); rtems_isr uti596DynamicInterruptHandler (rtems_vector_number); void uti596_txDaemon (void *); @@ -2463,7 +2463,7 @@ void uti596_stop(struct uti596_softc *sc) } static int -uti596_ioctl (struct ifnet *ifp, int command, caddr_t data) +uti596_ioctl (struct ifnet *ifp, u_long command, caddr_t data) { struct uti596_softc *sc = ifp->if_softc; int error = 0; -- cgit v1.2.3