From 8c83cbcc969576edb3f526fea6443b9d9ec2a8c4 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Thu, 4 Aug 2016 23:32:06 +0200 Subject: classic networking: do not reference BSP_irq_enabled_at_i8259s which is no more available on i386. This change is required to build RTEMS with classic "--enable-networking" and link applications/tests which reference RTEMS_BSP_NETWORK_DRIVER_ATTACH. --- c/src/libchip/network/dec21140.c | 7 +------ c/src/libchip/network/elnk.c | 12 +----------- c/src/libchip/network/if_dc.c | 9 +-------- c/src/libchip/network/if_fxp.c | 7 +------ 4 files changed, 4 insertions(+), 31 deletions(-) (limited to 'c/src/libchip/network') diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index aa6be29af8..3bfc91d32a 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -345,11 +345,6 @@ static void no_op(const rtems_irq_connect_data* irq) return; } -static int dec21140IsOn(const rtems_irq_connect_data* irq) -{ - return BSP_irq_enabled_at_i8259s (irq->name); -} - /* * DEC21140 interrupt handler */ @@ -539,7 +534,7 @@ dec21140Enet_initialize_hardware (struct dec21140_softc *sc) sc->irqInfo.hdl = (rtems_irq_hdl)dec21140Enet_interrupt_handler_entry; sc->irqInfo.on = no_op; sc->irqInfo.off = no_op; - sc->irqInfo.isOn = dec21140IsOn; + sc->irqInfo.isOn = NULL; #ifdef DEC_DEBUG printk( "dec2114x: Installing IRQ %d\n", sc->irqInfo.name ); diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c index 06ece5b85b..1c63e35bfd 100644 --- a/c/src/libchip/network/elnk.c +++ b/c/src/libchip/network/elnk.c @@ -1875,16 +1875,6 @@ static void no_op(const rtems_irq_connect_data* irq) -static int elnkIsOn(const rtems_irq_connect_data* irq) -{ - return BSP_irq_enabled_at_i8259s (irq->name); -} - - - - - - static void elnk_start_txchain( struct elnk_softc *sc, struct TXMD *chainhead ) { @@ -2214,7 +2204,7 @@ elnk_initialize_hardware (struct elnk_softc *sc) sc->irqInfo.hdl = (rtems_irq_hdl)elnk_interrupt_handler_entry; sc->irqInfo.on = no_op; sc->irqInfo.off = no_op; - sc->irqInfo.isOn = elnkIsOn; + sc->irqInfo.isOn = NULL; if( sc->irqInfo.name != 255 ) { diff --git a/c/src/libchip/network/if_dc.c b/c/src/libchip/network/if_dc.c index 1563be5e29..24f2fc15bc 100644 --- a/c/src/libchip/network/if_dc.c +++ b/c/src/libchip/network/if_dc.c @@ -1893,13 +1893,6 @@ nop(const rtems_irq_connect_data* unused) { } -static int -decISON(const rtems_irq_connect_data* irq) -{ - return (BSP_irq_enabled_at_i8259s(irq->name)); -} - - /* * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. @@ -2023,7 +2016,7 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching) sc->irqInfo.handle = (void *)sc; /* new parameter */ sc->irqInfo.on = nop; sc->irqInfo.off = nop; - sc->irqInfo.isOn = decISON; + sc->irqInfo.isOn = NULL; #ifdef BSP_SHARED_HANDLER_SUPPORT rc = BSP_install_rtems_shared_irq_handler( &sc->irqInfo ); diff --git a/c/src/libchip/network/if_fxp.c b/c/src/libchip/network/if_fxp.c index ce59db1599..35d7c072a4 100644 --- a/c/src/libchip/network/if_fxp.c +++ b/c/src/libchip/network/if_fxp.c @@ -431,11 +431,6 @@ static void nopOn(const rtems_irq_connect_data* notUsed) */ } -static int fxpIsOn(const rtems_irq_connect_data* irq) -{ - return BSP_irq_enabled_at_i8259s (irq->name); -} - int rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching) { @@ -1933,7 +1928,7 @@ rtems_task_wake_after(100); sc->irqInfo.hdl = (rtems_irq_hdl)fxp_intr; sc->irqInfo.on = nopOn; sc->irqInfo.off = nopOn; - sc->irqInfo.isOn = fxpIsOn; + sc->irqInfo.isOn = NULL; rv = BSP_install_rtems_irq_handler (&sc->irqInfo); if (rv != 1) { rtems_panic ("Can't attach fxp interrupt handler for irq %d\n", -- cgit v1.2.3