From 26e90fb1c671f0c03304f15f7030186231474196 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 30 Oct 2012 17:42:17 +0100 Subject: libnetworking: Use system events Add reserved system events RTEMS_EVENT_SYSTEM_NETWORK_SBWAIT and RTEMS_EVENT_SYSTEM_NETWORK_SOSLEEP. Add and use rtems_bsdnet_event_send(). --- .../lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c | 2 +- .../libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c | 2 +- c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c | 2 +- c/src/lib/libbsp/powerpc/mbx8xx/network/network.c | 10 +++++----- c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c | 12 ++++++------ c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c | 6 +++--- c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c | 8 ++++---- .../libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c | 6 +++--- c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c | 4 ++-- c/src/lib/libbsp/powerpc/psim/network/if_sim.c | 2 +- c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c | 6 +++--- c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c | 6 +++--- c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c | 6 +++--- 13 files changed, 36 insertions(+), 36 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c b/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c index 8c1fd74319..53f9b545af 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c @@ -1094,7 +1094,7 @@ static void mveth_isr(rtems_irq_hdl_param arg) unsigned unit = (unsigned)arg; mveth_disable_irqs(&theMvEths[unit].pvt, -1); theMvEths[unit].pvt.stats.irqs++; - rtems_event_send( theMvEths[unit].pvt.tid, 1<tid, EX_EVENT ); + rtems_bsdnet_event_send( sc->tid, EX_EVENT ); } static void net_daemon(void *arg) diff --git a/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c b/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c index 060167adda..bbaf148333 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c +++ b/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c @@ -213,7 +213,7 @@ static mpc5200_fec_context enet_driver[NIFACES]; static void mpc5200_fec_send_event(rtems_id task) { - rtems_event_send(task, FEC_EVENT); + rtems_bsdnet_event_send(task, FEC_EVENT); } static void mpc5200_fec_wait_for_event(void) diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c index 5a10d7bb11..b22e58d58c 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c @@ -150,7 +150,7 @@ static void m8xx_scc1_interrupt_handler (void *unused) m8xx.scc1.scce = 0x8; /* Clear receive frame int */ m8xx.scc1.sccm &= ~0x8; /* Disable receive frame ints */ enet_driver[0].rxInterrupts++; /* Rx int has occurred */ - rtems_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); } /* Buffer transmitted or transmitter error? */ @@ -158,7 +158,7 @@ static void m8xx_scc1_interrupt_handler (void *unused) m8xx.scc1.scce = 0x12; /* Clear Tx int */ m8xx.scc1.sccm &= ~0x12; /* Disable Tx ints */ enet_driver[0].txInterrupts++; /* Tx int has occurred */ - rtems_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); } } @@ -174,7 +174,7 @@ static void m860_fec_interrupt_handler () if (m8xx.fec.ievent & M8xx_FEC_IEVENT_RFINT) { m8xx.fec.ievent = M8xx_FEC_IEVENT_RFINT; enet_driver[0].rxInterrupts++; - rtems_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); } /* @@ -183,7 +183,7 @@ static void m860_fec_interrupt_handler () if (m8xx.fec.ievent & M8xx_FEC_IEVENT_TFINT) { m8xx.fec.ievent = M8xx_FEC_IEVENT_TFINT; enet_driver[0].txInterrupts++; - rtems_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); } } #endif @@ -1272,7 +1272,7 @@ m8xx_enet_start (struct ifnet *ifp) { struct m8xx_enet_struct *sc = ifp->if_softc; - rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); ifp->if_flags |= IFF_OACTIVE; } diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c index b9939ffc89..2a03f12133 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c @@ -644,7 +644,7 @@ static void smsc9218i_receive_dma_done( ++e->receive_dma_errors; } - sc = rtems_event_send(channel_entry->id, SMSC9218I_EVENT_DMA); + sc = rtems_bsdnet_event_send(channel_entry->id, SMSC9218I_EVENT_DMA); ASSERT_SC(sc); jc->done = jc->produce; @@ -668,7 +668,7 @@ static void smsc9218i_transmit_dma_done( ++e->transmit_dma_interrupts; - sc = rtems_event_send(channel_entry->id, event); + sc = rtems_bsdnet_event_send(channel_entry->id, event); ASSERT_SC(sc); } @@ -721,7 +721,7 @@ static void smsc9218i_interrupt_handler(void *arg) int_en &= ~SMSC9218I_INT_RSFL; ++e->receive_interrupts; - sc = rtems_event_send(e->receive_task, SMSC9218I_EVENT_RX); + sc = rtems_bsdnet_event_send(e->receive_task, SMSC9218I_EVENT_RX); ASSERT_SC(sc); } @@ -730,7 +730,7 @@ static void smsc9218i_interrupt_handler(void *arg) SMSC9218I_PRINTK("interrupt: phy\n"); int_en &= ~SMSC9218I_INT_PHY; ++e->phy_interrupts; - sc = rtems_event_send(e->receive_task, SMSC9218I_EVENT_PHY); + sc = rtems_bsdnet_event_send(e->receive_task, SMSC9218I_EVENT_PHY); ASSERT_SC(sc); } @@ -739,7 +739,7 @@ static void smsc9218i_interrupt_handler(void *arg) SMSC9218I_PRINTK("interrupt: transmit\n"); int_en &= ~SMSC9218I_INT_TDFA; ++e->transmit_interrupts; - sc = rtems_event_send(e->transmit_task, SMSC9218I_EVENT_TX); + sc = rtems_bsdnet_event_send(e->transmit_task, SMSC9218I_EVENT_TX); ASSERT_SC(sc); } @@ -1979,7 +1979,7 @@ static void smsc9218i_interface_start(struct ifnet *ifp) /* Interface is now active */ ifp->if_flags |= IFF_OACTIVE; - sc = rtems_event_send(e->transmit_task, SMSC9218I_EVENT_TX_START); + sc = rtems_bsdnet_event_send(e->transmit_task, SMSC9218I_EVENT_TX_START); ASSERT_SC(sc); } diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c index e6997b2c79..5e628963a6 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c @@ -158,7 +158,7 @@ m8xx_scc3_interrupt_handler (rtems_irq_hdl_param unused) m8260.scc3.scce = M8260_SCCE_RXF; /* m8260.scc3.sccm &= ~M8260_SCCE_RXF; */ hdlc_driver[0].rxInterrupts++; - rtems_event_send (hdlc_driver[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (hdlc_driver[0].rxDaemonTid, INTERRUPT_EVENT); /* printk( "Rx " ); */ @@ -172,7 +172,7 @@ m8xx_scc3_interrupt_handler (rtems_irq_hdl_param unused) m8260.scc3.scce = M8260_SCCE_TX | M8260_SCCE_TXE; /* m8260.scc3.sccm &= ~(M8260_SCCE_TX | M8260_SCCE_TXE); */ hdlc_driver[0].txInterrupts++; - rtems_event_send (hdlc_driver[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (hdlc_driver[0].txDaemonTid, INTERRUPT_EVENT); /* printk( "Tx " ); */ @@ -736,7 +736,7 @@ m8260_hdlc_start (struct ifnet *ifp) { struct m8260_hdlc_struct *sc = ifp->if_softc; - rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); ifp->if_flags |= IFF_OACTIVE; } diff --git a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c b/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c index d2b8464cfc..7503be030f 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c +++ b/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c @@ -2256,7 +2256,7 @@ rtems_interrupt_level l; if ( mp->isr ) mp->isr( mp->isr_arg ); else - rtems_event_send( mp->tid, mp->event ); + rtems_bsdnet_event_send( mp->tid, mp->event ); } static void tsec_risr(rtems_irq_hdl_param arg) @@ -2273,7 +2273,7 @@ rtems_interrupt_level l; if ( mp->isr ) mp->isr( mp->isr_arg ); else - rtems_event_send( mp->tid, mp->event ); + rtems_bsdnet_event_send( mp->tid, mp->event ); } static void tsec_eisr(rtems_irq_hdl_param arg) @@ -2295,7 +2295,7 @@ uint32_t pending; if ( mp->isr ) mp->isr( mp->isr_arg ); else - rtems_event_send( mp->tid, mp->event ); + rtems_bsdnet_event_send( mp->tid, mp->event ); if ( (TSEC_IEVENT_TXE & pending) ) { if ( (TSEC_IEVENT_EBERR & pending) && ++mp->stats.eberrs > MAXEBERRS ) { @@ -2325,7 +2325,7 @@ rtems_interrupt_level l; if ( mp->isr ) mp->isr( mp->isr_arg ); else - rtems_event_send( mp->tid, mp->event ); + rtems_bsdnet_event_send( mp->tid, mp->event ); } } diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c index fec89a1953..2b5295b176 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c @@ -191,7 +191,7 @@ static void GT64260eth_isr(void) } - rtems_event_send(sc->daemonTid, events); + rtems_bsdnet_event_send(sc->daemonTid, events); } static rtems_irq_connect_data GT64260ethIrqData={ @@ -291,7 +291,7 @@ static void GT64260eth_stop(struct GTeth_softc *sc) /* kill the daemon. We also must release the networking * semaphore or there'll be a deadlock... */ - rtems_event_send(sc->daemonTid, KILL_EVENT); + rtems_bsdnet_event_send(sc->daemonTid, KILL_EVENT); rtems_bsdnet_semaphore_release(); sc->daemonTid=0; @@ -615,7 +615,7 @@ static void GTeth_ifstart(struct ifnet *ifp) } ifp->if_flags |= IFF_OACTIVE; - rtems_event_send (sc->daemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->daemonTid, START_TRANSMIT_EVENT); #ifdef GT_DEBUG printk(")\n"); #endif diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c index b434e50733..b6a51848e8 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c @@ -528,7 +528,7 @@ i82544EI_ifstart(struct ifnet *ifp) } ifp->if_flags |= IFF_OACTIVE; - rtems_event_send (sc->daemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->daemonTid, START_TRANSMIT_EVENT); #ifdef WM_DEBUG printk(")\n"); #endif @@ -628,7 +628,7 @@ static void i82544EI_isr(rtems_irq_hdl_param handle) if (icr & ICR_LSC) sc->stats.linkStatusChng++; if (icr & ICR_RXCFG) sc->stats.rxC_ordered++; - rtems_event_send(sc->daemonTid, events); + rtems_bsdnet_event_send(sc->daemonTid, events); } /* diff --git a/c/src/lib/libbsp/powerpc/psim/network/if_sim.c b/c/src/lib/libbsp/powerpc/psim/network/if_sim.c index 12d617d8a2..c419acdd8a 100644 --- a/c/src/lib/libbsp/powerpc/psim/network/if_sim.c +++ b/c/src/lib/libbsp/powerpc/psim/network/if_sim.c @@ -303,7 +303,7 @@ struct ifsim_softc *sc = arg; #endif ifsim_out(sc, IFSIM_IEN_REG, 0); - rtems_event_send(ifsim_tid, (1<<(sc-theIfSims))); + rtems_bsdnet_event_send(ifsim_tid, (1<<(sc-theIfSims))); } static void diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c index 288cc32c52..20b490ffda 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c +++ b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c @@ -330,7 +330,7 @@ static void m8xx_fec_interrupt_handler (void *unused) if (m8xx.fec.ievent & M8xx_FEC_IEVENT_RFINT) { m8xx.fec.ievent = M8xx_FEC_IEVENT_RFINT; enet_driver[0].rxInterrupts++; - rtems_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); } /* @@ -339,7 +339,7 @@ static void m8xx_fec_interrupt_handler (void *unused) if (m8xx.fec.ievent & M8xx_FEC_IEVENT_TFINT) { m8xx.fec.ievent = M8xx_FEC_IEVENT_TFINT; enet_driver[0].txInterrupts++; - rtems_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); } } @@ -920,7 +920,7 @@ m8xx_fec_enet_start (struct ifnet *ifp) { struct m8xx_fec_enet_struct *sc = ifp->if_softc; - rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); ifp->if_flags |= IFF_OACTIVE; } diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c index a98eae064b..3db350c43a 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c +++ b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c @@ -176,7 +176,7 @@ static void m8xx_scc1_interrupt_handler (void *unused) m8xx.scc1.scce = 0x8; /* Clear receive frame int */ m8xx.scc1.sccm &= ~0x8; /* Disable receive frame ints */ enet_driver[0].rxInterrupts++; /* Rx int has occurred */ - rtems_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); } /* Buffer transmitted or transmitter error? */ @@ -184,7 +184,7 @@ static void m8xx_scc1_interrupt_handler (void *unused) m8xx.scc1.scce = 0x12; /* Clear Tx int */ m8xx.scc1.sccm &= ~0x12; /* Disable Tx ints */ enet_driver[0].txInterrupts++; /* Tx int has occurred */ - rtems_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); } } @@ -807,7 +807,7 @@ m8xx_enet_start (struct ifnet *ifp) { struct m8xx_enet_struct *sc = ifp->if_softc; - rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); ifp->if_flags |= IFF_OACTIVE; } diff --git a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c b/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c index 5fc0586907..878c78fd9c 100644 --- a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c +++ b/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c @@ -454,7 +454,7 @@ void xilTemacIsrSingle(struct XilTemac* xilTemac) newipier &= ~XTE_IPXR_RECV_DONE_MASK; - rtems_event_send(gXilRxThread, xilTemac->iIoEvent); + rtems_bsdnet_event_send(gXilRxThread, xilTemac->iIoEvent); } if(pending & XTE_IPXR_XMIT_DONE_MASK) { /* We've transmitted a packet. This interrupt is only ever enabled in @@ -469,7 +469,7 @@ void xilTemacIsrSingle(struct XilTemac* xilTemac) newipier &= ~XTE_IPXR_XMIT_DONE_MASK; - rtems_event_send(gXilTxThread, xilTemac->iIoEvent); + rtems_bsdnet_event_send(gXilTxThread, xilTemac->iIoEvent); } if(pending & XTE_IPXR_RECV_DROPPED_MASK) { /* A packet was dropped (because it was invalid, or receiving it @@ -608,7 +608,7 @@ void xilTemacSend(struct ifnet* ifp) struct XilTemac* xilTemac = ifp->if_softc; /* wake up tx thread w/ outbound interface's signal */ - rtems_event_send( gXilTxThread, xilTemac->iIoEvent ); + rtems_bsdnet_event_send( gXilTxThread, xilTemac->iIoEvent ); ifp->if_flags |= IFF_OACTIVE; } -- cgit v1.2.3