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(). --- c/src/lib/libbsp/m68k/av5282/network/network.c | 6 +++--- c/src/lib/libbsp/m68k/csb360/network/network.c | 6 +++--- c/src/lib/libbsp/m68k/gen68302/network/network.c | 6 +++--- c/src/lib/libbsp/m68k/gen68360/network/network.c | 6 +++--- c/src/lib/libbsp/m68k/genmcf548x/network/network.c | 8 ++++---- c/src/lib/libbsp/m68k/mcf5235/network/network.c | 6 +++--- c/src/lib/libbsp/m68k/mcf5329/network/network.c | 6 +++--- c/src/lib/libbsp/m68k/mvme167/network/network.c | 12 ++++++------ c/src/lib/libbsp/m68k/uC5282/network/network.c | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/av5282/network/network.c b/c/src/lib/libbsp/m68k/av5282/network/network.c index 8045ef4e78..90c0b4a377 100644 --- a/c/src/lib/libbsp/m68k/av5282/network/network.c +++ b/c/src/lib/libbsp/m68k/av5282/network/network.c @@ -117,7 +117,7 @@ mcf5282_fec_rx_interrupt_handler( rtems_vector_number v ) MCF5282_FEC_EIR = MCF5282_FEC_EIR_RXF; MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_RXF; enet_driver[0].rxInterrupts++; - rtems_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); } static rtems_isr @@ -126,7 +126,7 @@ mcf5282_fec_tx_interrupt_handler( rtems_vector_number v ) MCF5282_FEC_EIR = MCF5282_FEC_EIR_TXF; MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_TXF; enet_driver[0].txInterrupts++; - rtems_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); } static rtems_isr @@ -653,7 +653,7 @@ mcf5282_enet_start(struct ifnet *ifp) { struct mcf5282_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/m68k/csb360/network/network.c b/c/src/lib/libbsp/m68k/csb360/network/network.c index bb488b3118..fa0fa94b88 100644 --- a/c/src/lib/libbsp/m68k/csb360/network/network.c +++ b/c/src/lib/libbsp/m68k/csb360/network/network.c @@ -198,7 +198,7 @@ rtems_isr enet_rx_isr(rtems_vector_number vector) cp; g_enet_regs->eir = MCF5272_ENET_EIR_RXF; enet_driver[0].rxInterrupts++; - rtems_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].rxDaemonTid, INTERRUPT_EVENT); } cp; } @@ -213,7 +213,7 @@ rtems_isr enet_tx_isr(rtems_vector_number vector) cp; g_enet_regs->eir = MCF5272_ENET_EIR_TXF; enet_driver[0].txInterrupts++; - rtems_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (enet_driver[0].txDaemonTid, INTERRUPT_EVENT); } cp; } @@ -746,7 +746,7 @@ mcf5272_enet_start (struct ifnet *ifp) struct mcf5272_enet_struct *sc = ifp->if_softc; cp; - rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); cp; ifp->if_flags |= IFF_OACTIVE; } diff --git a/c/src/lib/libbsp/m68k/gen68302/network/network.c b/c/src/lib/libbsp/m68k/gen68302/network/network.c index a8f2c2e0e0..67cd951ef8 100644 --- a/c/src/lib/libbsp/m68k/gen68302/network/network.c +++ b/c/src/lib/libbsp/m68k/gen68302/network/network.c @@ -126,7 +126,7 @@ m302Enet_interrupt_handler (rtems_vector_number v) M68en302imp_intr_event = INTR_EVENT_BIT_RFINT; M68en302imp_intr_mask &= ~INTR_MASK_BIT_RFIEN; scc_softc[0].rxInterrupts++; - rtems_event_send (scc_softc[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (scc_softc[0].rxDaemonTid, INTERRUPT_EVENT); } /* @@ -137,7 +137,7 @@ m302Enet_interrupt_handler (rtems_vector_number v) M68en302imp_intr_event = INTR_EVENT_BIT_TFINT | INTR_EVENT_BIT_TXB; M68en302imp_intr_mask &= ~(INTR_MASK_BIT_TFIEN | INTR_MASK_BIT_TXIEN); scc_softc[0].txInterrupts++; - rtems_event_send (scc_softc[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (scc_softc[0].txDaemonTid, INTERRUPT_EVENT); } } @@ -746,7 +746,7 @@ scc_start (struct ifnet *ifp) { struct scc_softc *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/m68k/gen68360/network/network.c b/c/src/lib/libbsp/m68k/gen68360/network/network.c index 0279bbd09c..3ed3bf5590 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/network.c +++ b/c/src/lib/libbsp/m68k/gen68360/network/network.c @@ -119,7 +119,7 @@ m360Enet_interrupt_handler (rtems_vector_number v) m360.scc1.scce = 0x8; m360.scc1.sccm &= ~0x8; scc_softc[0].rxInterrupts++; - rtems_event_send (scc_softc[0].rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (scc_softc[0].rxDaemonTid, INTERRUPT_EVENT); } /* @@ -129,7 +129,7 @@ m360Enet_interrupt_handler (rtems_vector_number v) m360.scc1.scce = 0x12; m360.scc1.sccm &= ~0x12; scc_softc[0].txInterrupts++; - rtems_event_send (scc_softc[0].txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send (scc_softc[0].txDaemonTid, INTERRUPT_EVENT); } m360.cisr = 1UL << 30; /* Clear SCC1 interrupt-in-service bit */ } @@ -796,7 +796,7 @@ scc_start (struct ifnet *ifp) { struct scc_softc *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/m68k/genmcf548x/network/network.c b/c/src/lib/libbsp/m68k/genmcf548x/network/network.c index 1bca1c8a12..3f5e6d3b7b 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/network/network.c +++ b/c/src/lib/libbsp/m68k/genmcf548x/network/network.c @@ -691,7 +691,7 @@ void mcf548x_fec_irq_handler(rtems_vector_number vector) */ if (ievent & (MCF548X_FEC_EIR_RFERR | MCF548X_FEC_EIR_XFERR)) { MCF548X_FEC_EIMR(chan) &=~(MCF548X_FEC_EIMR_RFERR | MCF548X_FEC_EIMR_XFERR); - rtems_event_send(sc->rxDaemonTid, FATAL_INT_EVENT); + rtems_bsdnet_event_send(sc->rxDaemonTid, FATAL_INT_EVENT); } } @@ -707,7 +707,7 @@ void mcf548x_mcdma_rx_irq_handler(void * param) mcdma_glue_irq_disable(sc->rxDmaChan);/*Disable receive ints*/ sc->rxInterrupts++; /* Rx int has occurred */ - rtems_event_send(sc->rxDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send(sc->rxDaemonTid, INTERRUPT_EVENT); } } @@ -727,7 +727,7 @@ void mcf548x_mcdma_tx_irq_handler(void * param) sc->txInterrupts++; /* Tx int has occurred */ - rtems_event_send(sc->txDaemonTid, INTERRUPT_EVENT); + rtems_bsdnet_event_send(sc->txDaemonTid, INTERRUPT_EVENT); } } @@ -1167,7 +1167,7 @@ static void mcf548x_fec_tx_start(struct ifnet *ifp) ifp->if_flags |= IFF_OACTIVE; - rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); } diff --git a/c/src/lib/libbsp/m68k/mcf5235/network/network.c b/c/src/lib/libbsp/m68k/mcf5235/network/network.c index ed98b4defa..7ce20e0400 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/network/network.c +++ b/c/src/lib/libbsp/m68k/mcf5235/network/network.c @@ -109,7 +109,7 @@ mcf5235_fec_rx_interrupt_handler( rtems_vector_number v ) MCF5235_FEC_EIR = MCF5235_FEC_EIR_RXF; MCF5235_FEC_EIMR &= ~MCF5235_FEC_EIMR_RXF; enet_driver[0].rxInterrupts++; - rtems_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); } static rtems_isr @@ -118,7 +118,7 @@ mcf5235_fec_tx_interrupt_handler( rtems_vector_number v ) MCF5235_FEC_EIR = MCF5235_FEC_EIR_TXF; MCF5235_FEC_EIMR &= ~MCF5235_FEC_EIMR_TXF; enet_driver[0].txInterrupts++; - rtems_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); } /* @@ -626,7 +626,7 @@ mcf5235_enet_start(struct ifnet *ifp) { struct mcf5235_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/m68k/mcf5329/network/network.c b/c/src/lib/libbsp/m68k/mcf5329/network/network.c index acc36abbdd..62d90f1219 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/network/network.c +++ b/c/src/lib/libbsp/m68k/mcf5329/network/network.c @@ -109,7 +109,7 @@ static rtems_isr mcf5329_fec_rx_interrupt_handler(rtems_vector_number v) MCF_FEC_EIR = MCF_FEC_EIR_RXF; MCF_FEC_EIMR &= ~MCF_FEC_EIMR_RXF; enet_driver[0].rxInterrupts++; - rtems_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); } static rtems_isr mcf5329_fec_tx_interrupt_handler(rtems_vector_number v) @@ -117,7 +117,7 @@ static rtems_isr mcf5329_fec_tx_interrupt_handler(rtems_vector_number v) MCF_FEC_EIR = MCF_FEC_EIR_TXF; MCF_FEC_EIMR &= ~MCF_FEC_EIMR_TXF; enet_driver[0].txInterrupts++; - rtems_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); } extern char _CoreSRamBase[]; @@ -611,7 +611,7 @@ static void mcf5329_enet_start(struct ifnet *ifp) { struct mcf5329_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/m68k/mvme167/network/network.c b/c/src/lib/libbsp/m68k/mvme167/network/network.c index 07132cb915..ff2356fdd9 100644 --- a/c/src/lib/libbsp/m68k/mvme167/network/network.c +++ b/c/src/lib/libbsp/m68k/mvme167/network/network.c @@ -1136,7 +1136,7 @@ void uti596_reset_hardware( */ if ( sc->txDaemonTid && pCmd != I596_NULL ) { printk(("****RESET: wakes transmitter!\n")) - status_code = rtems_event_send (sc->txDaemonTid, + status_code = rtems_bsdnet_event_send (sc->txDaemonTid, INTERRUPT_EVENT); if ( status_code != RTEMS_SUCCESSFUL ) { @@ -1799,7 +1799,7 @@ static void uti596_start( printk(("uti596_start: begins\n")) #endif - rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); + rtems_bsdnet_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); ifp->if_flags |= IFF_OACTIVE; } @@ -2272,7 +2272,7 @@ int fullStatus; #ifdef DBG_ISR printk(("uti596_DynamicInterruptHandler: Wake %#x\n",uti596_softc.rxDaemonTid)) #endif - sc = rtems_event_send(uti596_softc.rxDaemonTid, INTERRUPT_EVENT); + sc = rtems_bsdnet_event_send(uti596_softc.rxDaemonTid, INTERRUPT_EVENT); if ( sc != RTEMS_SUCCESSFUL ) { rtems_panic("Can't notify rxDaemon: %s\n", rtems_status_text (sc)); @@ -2367,7 +2367,7 @@ int fullStatus; #endif if ( uti596_softc.txDaemonTid ) { /* Ensure that the transmitter is present */ - sc = rtems_event_send (uti596_softc.txDaemonTid, + sc = rtems_bsdnet_event_send (uti596_softc.txDaemonTid, INTERRUPT_EVENT); if ( sc != RTEMS_SUCCESSFUL ) { @@ -2432,7 +2432,7 @@ int fullStatus; uti596_softc.nic_reset = 1; if ( uti596_softc.txDaemonTid) { /* Ensure that a transmitter is present */ - sc = rtems_event_send (uti596_softc.txDaemonTid, + sc = rtems_bsdnet_event_send (uti596_softc.txDaemonTid, INTERRUPT_EVENT); if ( sc != RTEMS_SUCCESSFUL ) { printk(("****ERROR:Could NOT send event to tid 0x%x : %s\n", @@ -2584,7 +2584,7 @@ int fullStatus; /* Do this last, to ensure that the reset is called at the right time. */ if ( uti596_softc.nic_reset ) { uti596_softc.nic_reset = 0; - sc = rtems_event_send(uti596_softc.resetDaemonTid, NIC_RESET_EVENT); + sc = rtems_bsdnet_event_send(uti596_softc.resetDaemonTid, NIC_RESET_EVENT); if ( sc != RTEMS_SUCCESSFUL ) rtems_panic ("Can't notify resetDaemon: %s\n", rtems_status_text (sc)); } diff --git a/c/src/lib/libbsp/m68k/uC5282/network/network.c b/c/src/lib/libbsp/m68k/uC5282/network/network.c index 475ab22de7..a29a2ad4f9 100644 --- a/c/src/lib/libbsp/m68k/uC5282/network/network.c +++ b/c/src/lib/libbsp/m68k/uC5282/network/network.c @@ -158,7 +158,7 @@ mcf5282_fec_rx_interrupt_handler( rtems_vector_number v ) MCF5282_FEC_EIR = MCF5282_FEC_EIR_RXF; MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_RXF; enet_driver[0].rxInterrupts++; - rtems_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT); } static rtems_isr @@ -167,7 +167,7 @@ mcf5282_fec_tx_interrupt_handler( rtems_vector_number v ) MCF5282_FEC_EIR = MCF5282_FEC_EIR_TXF; MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_TXF; enet_driver[0].txInterrupts++; - rtems_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); + rtems_bsdnet_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT); } static rtems_isr @@ -688,7 +688,7 @@ mcf5282_enet_start(struct ifnet *ifp) { struct mcf5282_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; } -- cgit v1.2.3