forked from Imagelibrary/rtems
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.
This commit is contained in:
@@ -428,14 +428,6 @@ ne_interrupt_off (const rtems_irq_connect_data *irq)
|
|||||||
outport_byte (sc->port + IMR, 0);
|
outport_byte (sc->port + IMR, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return whether NE2000 interrupts are on. */
|
|
||||||
|
|
||||||
static int
|
|
||||||
ne_interrupt_is_on (const rtems_irq_connect_data *irq)
|
|
||||||
{
|
|
||||||
return BSP_irq_enabled_at_i8259s (irq->name);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Initialize the NE2000 hardware. */
|
/* Initialize the NE2000 hardware. */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -526,7 +518,7 @@ ne_init_irq_handler(int irno)
|
|||||||
irq.handle = (rtems_irq_hdl) irno;
|
irq.handle = (rtems_irq_hdl) irno;
|
||||||
irq.on = ne_interrupt_on;
|
irq.on = ne_interrupt_on;
|
||||||
irq.off = ne_interrupt_off;
|
irq.off = ne_interrupt_off;
|
||||||
irq.isOn = ne_interrupt_is_on;
|
irq.isOn = NULL;
|
||||||
|
|
||||||
if (!BSP_install_rtems_irq_handler (&irq))
|
if (!BSP_install_rtems_irq_handler (&irq))
|
||||||
rtems_panic ("Can't attach NE interrupt handler for irq %d\n", irno);
|
rtems_panic ("Can't attach NE interrupt handler for irq %d\n", irno);
|
||||||
|
|||||||
@@ -345,11 +345,6 @@ static void no_op(const rtems_irq_connect_data* irq)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dec21140IsOn(const rtems_irq_connect_data* irq)
|
|
||||||
{
|
|
||||||
return BSP_irq_enabled_at_i8259s (irq->name);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* DEC21140 interrupt handler
|
* 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.hdl = (rtems_irq_hdl)dec21140Enet_interrupt_handler_entry;
|
||||||
sc->irqInfo.on = no_op;
|
sc->irqInfo.on = no_op;
|
||||||
sc->irqInfo.off = no_op;
|
sc->irqInfo.off = no_op;
|
||||||
sc->irqInfo.isOn = dec21140IsOn;
|
sc->irqInfo.isOn = NULL;
|
||||||
|
|
||||||
#ifdef DEC_DEBUG
|
#ifdef DEC_DEBUG
|
||||||
printk( "dec2114x: Installing IRQ %d\n", sc->irqInfo.name );
|
printk( "dec2114x: Installing IRQ %d\n", sc->irqInfo.name );
|
||||||
|
|||||||
@@ -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
|
static void
|
||||||
elnk_start_txchain( struct elnk_softc *sc, struct TXMD *chainhead )
|
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.hdl = (rtems_irq_hdl)elnk_interrupt_handler_entry;
|
||||||
sc->irqInfo.on = no_op;
|
sc->irqInfo.on = no_op;
|
||||||
sc->irqInfo.off = no_op;
|
sc->irqInfo.off = no_op;
|
||||||
sc->irqInfo.isOn = elnkIsOn;
|
sc->irqInfo.isOn = NULL;
|
||||||
|
|
||||||
if( sc->irqInfo.name != 255 )
|
if( sc->irqInfo.name != 255 )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
* Attach the interface. Allocate softc structures, do ifmedia
|
||||||
* setup and ethernet/BPF attach.
|
* 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.handle = (void *)sc; /* new parameter */
|
||||||
sc->irqInfo.on = nop;
|
sc->irqInfo.on = nop;
|
||||||
sc->irqInfo.off = nop;
|
sc->irqInfo.off = nop;
|
||||||
sc->irqInfo.isOn = decISON;
|
sc->irqInfo.isOn = NULL;
|
||||||
|
|
||||||
#ifdef BSP_SHARED_HANDLER_SUPPORT
|
#ifdef BSP_SHARED_HANDLER_SUPPORT
|
||||||
rc = BSP_install_rtems_shared_irq_handler( &sc->irqInfo );
|
rc = BSP_install_rtems_shared_irq_handler( &sc->irqInfo );
|
||||||
|
|||||||
@@ -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
|
int
|
||||||
rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
|
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.hdl = (rtems_irq_hdl)fxp_intr;
|
||||||
sc->irqInfo.on = nopOn;
|
sc->irqInfo.on = nopOn;
|
||||||
sc->irqInfo.off = nopOn;
|
sc->irqInfo.off = nopOn;
|
||||||
sc->irqInfo.isOn = fxpIsOn;
|
sc->irqInfo.isOn = NULL;
|
||||||
rv = BSP_install_rtems_irq_handler (&sc->irqInfo);
|
rv = BSP_install_rtems_irq_handler (&sc->irqInfo);
|
||||||
if (rv != 1) {
|
if (rv != 1) {
|
||||||
rtems_panic ("Can't attach fxp interrupt handler for irq %d\n",
|
rtems_panic ("Can't attach fxp interrupt handler for irq %d\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user