[PATCH 2/2] libnetworking: Use system events

Sebastian Huber sebastian.huber at embedded-brains.de
Wed Oct 31 16:06:00 UTC 2012


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/arm/csb336/network/network.c      |    6 +++---
 c/src/lib/libbsp/arm/csb337/network/network.c      |    6 +++---
 c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c     |    6 +++---
 c/src/lib/libbsp/arm/nds/wifi/wifi.c               |    4 ++--
 .../libbsp/arm/shared/lpc/network/lpc-ethernet.c   |   10 +++++-----
 c/src/lib/libbsp/i386/pc386/3c509/3c509.c          |    4 ++--
 c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c        |    6 +++---
 c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c        |    4 ++--
 .../lm32/shared/milkymist_networking/network.c     |    8 ++++----
 c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c         |    8 ++++----
 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 +++---
 c/src/lib/libbsp/mips/csb350/network/network.c     |    6 +++---
 .../powerpc/beatnik/network/if_mve/mv643xx_eth.c   |    2 +-
 .../powerpc/beatnik/network/porting/if_xxx_rtems.c |    2 +-
 .../libbsp/powerpc/gen5200/network_5200/network.c  |    2 +-
 c/src/lib/libbsp/powerpc/mbx8xx/network/network.c  |   10 +++++-----
 .../libbsp/powerpc/mpc55xxevb/network/smsc9218i.c  |   12 ++++++------
 .../libbsp/powerpc/mpc8260ads/network/network.c    |    6 +++---
 c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c   |    8 ++++----
 .../mvme5500/network/if_100MHz/GT64260eth.c        |    6 +++---
 .../powerpc/mvme5500/network/if_1GHz/if_wm.c       |    4 ++--
 c/src/lib/libbsp/powerpc/psim/network/if_sim.c     |    2 +-
 .../libbsp/powerpc/tqm8xx/network/network_fec.c    |    6 +++---
 .../libbsp/powerpc/tqm8xx/network/network_scc.c    |    6 +++---
 c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c |    6 +++---
 c/src/lib/libcpu/bfin/network/ethernet.c           |    6 +++---
 c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c    |    6 +++---
 c/src/libchip/network/cs8900.c                     |   12 ++++++------
 c/src/libchip/network/dec21140.c                   |    4 ++--
 c/src/libchip/network/elnk.c                       |   14 +++++++-------
 c/src/libchip/network/greth.c                      |    2 +-
 c/src/libchip/network/i82586.c                     |    4 ++--
 c/src/libchip/network/if_dc.c                      |    2 +-
 c/src/libchip/network/if_fxp.c                     |    2 +-
 c/src/libchip/network/open_eth.c                   |    6 +++---
 c/src/libchip/network/smc91111.c                   |    8 ++++----
 c/src/libchip/network/sonic.c                      |    6 +++---
 cpukit/libnetworking/rtems/rtems_bsdnet_internal.h |   12 ++++++++++--
 cpukit/libnetworking/rtems/rtems_glue.c            |   14 +++++++-------
 cpukit/libnetworking/rtems/rtems_select.c          |    4 ++--
 cpukit/rtems/include/rtems/rtems/event.h           |   10 ++++++++++
 49 files changed, 166 insertions(+), 148 deletions(-)

diff --git a/c/src/lib/libbsp/arm/csb336/network/network.c b/c/src/lib/libbsp/arm/csb336/network/network.c
index ec7fbe2..e513595 100644
--- a/c/src/lib/libbsp/arm/csb336/network/network.c
+++ b/c/src/lib/libbsp/arm/csb336/network/network.c
@@ -342,7 +342,7 @@ void mc9328mxl_enet_start(struct ifnet *ifp)
 {
     mc9328mxl_enet_softc_t *sc = ifp->if_softc;
 
-    rtems_event_send(sc->tx_task, START_TRANSMIT_EVENT);
+    rtems_bsdnet_event_send(sc->tx_task, START_TRANSMIT_EVENT);
     ifp->if_flags |= IFF_OACTIVE;
 }
 
@@ -691,7 +691,7 @@ static void enet_isr(rtems_irq_hdl_param unused)
         /* Disable the interrupt */
         int_reg &= ~LAN91C11X_INT_RXMASK;
 
-        rtems_event_send (softc.rx_task, START_RECEIVE_EVENT);
+        rtems_bsdnet_event_send (softc.rx_task, START_RECEIVE_EVENT);
     }
 
     /* Handle TX Empty interrupts */
@@ -704,7 +704,7 @@ static void enet_isr(rtems_irq_hdl_param unused)
         /* Acknowledge the interrupt */
         int_reg |= LAN91C11X_INT_TXE;
 
-        rtems_event_send(softc.tx_task, START_TRANSMIT_EVENT);
+        rtems_bsdnet_event_send(softc.tx_task, START_TRANSMIT_EVENT);
 
     }
 
diff --git a/c/src/lib/libbsp/arm/csb337/network/network.c b/c/src/lib/libbsp/arm/csb337/network/network.c
index 7c5fad7..e31bcc0 100644
--- a/c/src/lib/libbsp/arm/csb337/network/network.c
+++ b/c/src/lib/libbsp/arm/csb337/network/network.c
@@ -561,7 +561,7 @@ void at91rm9200_emac_start(struct ifnet *ifp)
 {
     at91rm9200_emac_softc_t *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;
 }
 
@@ -866,7 +866,7 @@ static void at91rm9200_emac_isr (rtems_irq_hdl_param unused)
                               EMAC_INT_RBNA |  /* Receive buf not available */
                               EMAC_INT_ROVR);  /* Receive overrun */
 
-        rtems_event_send (softc.rxDaemonTid, START_RECEIVE_EVENT);
+        rtems_bsdnet_event_send (softc.rxDaemonTid, START_RECEIVE_EVENT);
     }
 
     if (status32 & EMAC_INT_TCOM) {      /* Transmit buffer register empty */
@@ -874,7 +874,7 @@ static void at91rm9200_emac_isr (rtems_irq_hdl_param unused)
         /* disable the TX interrupts */
         EMAC_REG(EMAC_IDR) = EMAC_INT_TCOM;
 
-        rtems_event_send (softc.txDaemonTid, START_TRANSMIT_EVENT);
+        rtems_bsdnet_event_send (softc.txDaemonTid, START_TRANSMIT_EVENT);
     }
 }
 
diff --git a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c
index cf4933b..5db0433 100644
--- a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c
+++ b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c
@@ -300,14 +300,14 @@ ne_check_status (struct ne_softc *sc, int from_irq_handler)
       --sc->inuse;
       sc->transmitting = 0;
       if (sc->inuse > 0 || (sc->arpcom.ac_if.if_flags & IFF_OACTIVE) != 0)
-        rtems_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
+        rtems_bsdnet_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
     }
 
     /* Check for received packet.  */
     if ((status & (MSK_PRX | MSK_RXE)) != 0)
     {
       ++sc->stats.rx_acks;
-      rtems_event_send (sc->rx_daemon_tid, INTERRUPT_EVENT);
+      rtems_bsdnet_event_send (sc->rx_daemon_tid, INTERRUPT_EVENT);
     }
 
     /* Check for counter change.  */
@@ -921,7 +921,7 @@ ne_start (struct ifnet *ifp)
   printk("S");
 #endif
   /* Tell the transmit daemon to wake up and send a packet.  */
-  rtems_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
+  rtems_bsdnet_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
   ifp->if_flags |= IFF_OACTIVE;
 }
 
diff --git a/c/src/lib/libbsp/arm/nds/wifi/wifi.c b/c/src/lib/libbsp/arm/nds/wifi/wifi.c
index e674afb..23a229c 100644
--- a/c/src/lib/libbsp/arm/nds/wifi/wifi.c
+++ b/c/src/lib/libbsp/arm/nds/wifi/wifi.c
@@ -129,7 +129,7 @@ wifi_signal (struct mbuf *m)
   rtems_interrupt_enable (level);
 
   /* signal the rx daemon */
-  rtems_event_send (softc.rx_id, RECEIVE_EVENT);
+  rtems_bsdnet_event_send (softc.rx_id, RECEIVE_EVENT);
 }
 
 
@@ -309,7 +309,7 @@ wifi_start (struct ifnet *ifp)
 {
   /* wake up the send daemon */
   ifp->if_flags |= IFF_OACTIVE;
-  rtems_event_send (softc.tx_id, TRANSMIT_EVENT);
+  rtems_bsdnet_event_send (softc.tx_id, TRANSMIT_EVENT);
 }
 
 /*
diff --git a/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c b/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c
index c7a6dee..56df8d4 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c
+++ b/c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c
@@ -388,7 +388,7 @@ static void lpc_eth_interrupt_handler(void *arg)
   /* Send events to receive task */
   if (re != 0) {
     ++e->receive_interrupts;
-    (void) rtems_event_send(e->receive_task, re);
+    (void) rtems_bsdnet_event_send(e->receive_task, re);
   }
 
   /* Check transmit interrupts */
@@ -403,7 +403,7 @@ static void lpc_eth_interrupt_handler(void *arg)
   /* Send events to transmit task */
   if (te != 0) {
     ++e->transmit_interrupts;
-    (void) rtems_event_send(e->transmit_task, te);
+    (void) rtems_bsdnet_event_send(e->transmit_task, te);
   }
 
   LPC_ETH_PRINTK("interrupt: rx = 0x%08x, tx = 0x%08x\n", re, te);
@@ -1210,7 +1210,7 @@ static void lpc_eth_interface_init(void *arg)
         lpc_eth_receive_task,
         e
       );
-      sc = rtems_event_send(e->receive_task, LPC_ETH_EVENT_INITIALIZE);
+      sc = rtems_bsdnet_event_send(e->receive_task, LPC_ETH_EVENT_INITIALIZE);
       RTEMS_SYSLOG_ERROR_SC(sc, "send receive initialize event");
     }
 
@@ -1222,7 +1222,7 @@ static void lpc_eth_interface_init(void *arg)
         lpc_eth_transmit_task,
         e
       );
-      sc = rtems_event_send(e->transmit_task, LPC_ETH_EVENT_INITIALIZE);
+      sc = rtems_bsdnet_event_send(e->transmit_task, LPC_ETH_EVENT_INITIALIZE);
       RTEMS_SYSLOG_ERROR_SC(sc, "send transmit initialize event");
     }
 
@@ -1388,7 +1388,7 @@ static void lpc_eth_interface_start(struct ifnet *ifp)
 
   ifp->if_flags |= IFF_OACTIVE;
 
-  sc = rtems_event_send(e->transmit_task, LPC_ETH_EVENT_START);
+  sc = rtems_bsdnet_event_send(e->transmit_task, LPC_ETH_EVENT_START);
   RTEMS_SYSLOG_ERROR_SC(sc, "send transmit start event");
 }
 
diff --git a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
index a90a964..ec309ba 100644
--- a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
+++ b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
@@ -458,7 +458,7 @@ static rtems_isr ap_interrupt_handler( rtems_vector_number v )
    * to process all events required by this interrupt.
    */
   outw( BASE + EP_COMMAND, SET_INTR_MASK ); 	/* disable all Ints */
-  rtems_event_send( sc->rxDaemonTid, INTERRUPT_EVENT );
+  rtems_bsdnet_event_send( sc->rxDaemonTid, INTERRUPT_EVENT );
 }
 
 /**********************************************************************************
@@ -586,7 +586,7 @@ static void _3c509_start (struct ifnet *ifp)
 	struct ep_softc *sc = ifp->if_softc;
 	/*    printk ("S");  */
 	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/i386/pc386/ne2000/ne2000.c b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
index 6217e0a..b23699d 100644
--- a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
+++ b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
@@ -342,14 +342,14 @@ ne_check_status (struct ne_softc *sc, int from_irq_handler)
       --sc->inuse;
       sc->transmitting = 0;
       if (sc->inuse > 0 || (sc->arpcom.ac_if.if_flags & IFF_OACTIVE) != 0)
-        rtems_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
+        rtems_bsdnet_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
     }
 
     /* Check for received packet.  */
     if ((status & (MSK_PRX | MSK_RXE)) != 0)
     {
       ++sc->stats.rx_acks;
-      rtems_event_send (sc->rx_daemon_tid, INTERRUPT_EVENT);
+      rtems_bsdnet_event_send (sc->rx_daemon_tid, INTERRUPT_EVENT);
     }
 
     /* Check for counter change.  */
@@ -947,7 +947,7 @@ ne_start (struct ifnet *ifp)
   printk("S");
 #endif
   /* Tell the transmit daemon to wake up and send a packet.  */
-  rtems_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
+  rtems_bsdnet_event_send (sc->tx_daemon_tid, START_TRANSMIT_EVENT);
   ifp->if_flags |= IFF_OACTIVE;
 }
 
diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
index 6b40694..d26464c 100644
--- a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
+++ b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
@@ -164,7 +164,7 @@ wd8003Enet_interrupt_handler (void *unused)
   if (status & (MSK_PRX+MSK_RXE)) {
     outport_byte(tport+ISR, status & (MSK_PRX+MSK_RXE));
     wd_softc[0].rxInterrupts++;
-    rtems_event_send (wd_softc[0].rxDaemonTid, INTERRUPT_EVENT);
+    rtems_bsdnet_event_send (wd_softc[0].rxDaemonTid, INTERRUPT_EVENT);
   }
 
 }
@@ -435,7 +435,7 @@ wd_start (struct ifnet *ifp)
 {
 	struct wd_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/lm32/shared/milkymist_networking/network.c b/c/src/lib/libbsp/lm32/shared/milkymist_networking/network.c
index a2ec534..40cf944 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_networking/network.c
+++ b/c/src/lib/libbsp/lm32/shared/milkymist_networking/network.c
@@ -120,7 +120,7 @@ int rtems_minimac_driver_attach(struct rtems_bsdnet_ifconfig *config,
     tx_buffer[i] = 0x55;
   tx_buffer[7] = 0xd5;
   MM_WRITE(MM_MINIMAC_SETUP, 0);
-  rtems_event_send(tx_daemon_id, CTS_EVENT);
+  rtems_bsdnet_event_send(tx_daemon_id, CTS_EVENT);
   
   bsp_interrupt_vector_enable(MM_IRQ_ETHRX);
   bsp_interrupt_vector_enable(MM_IRQ_ETHTX);
@@ -130,7 +130,7 @@ int rtems_minimac_driver_attach(struct rtems_bsdnet_ifconfig *config,
 
 static void minimac_start(struct ifnet *ifp)
 {
-  rtems_event_send(tx_daemon_id, START_TRANSMIT_EVENT);
+  rtems_bsdnet_event_send(tx_daemon_id, START_TRANSMIT_EVENT);
   ifp->if_flags |= IFF_OACTIVE;
 }
 
@@ -193,7 +193,7 @@ static rtems_isr rx_interrupt_handler(rtems_vector_number vector)
   if(MM_READ(MM_MINIMAC_STATE1) == MINIMAC_STATE_PENDING)
     MM_WRITE(MM_MINIMAC_STATE1, MINIMAC_STATE_EMPTY);
 
-  rtems_event_send(rx_daemon_id, RX_EVENT);
+  rtems_bsdnet_event_send(rx_daemon_id, RX_EVENT);
 
   lm32_interrupt_ack(1 << MM_IRQ_ETHRX);
 }
@@ -291,7 +291,7 @@ static void send_packet(struct ifnet *ifp, struct mbuf *m)
 static rtems_isr tx_interrupt_handler(rtems_vector_number vector)
 {
   lm32_interrupt_ack(1 << MM_IRQ_ETHTX);
-  rtems_event_send(tx_daemon_id, CTS_EVENT);
+  rtems_bsdnet_event_send(tx_daemon_id, CTS_EVENT);
 }
 
 static void tx_daemon(void *arg)
diff --git a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c
index b8be8be..c70c760 100644
--- a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c
+++ b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c
@@ -560,7 +560,7 @@ void tsmac_init(void *arg)
   /*
    * Wake up receive task to receive packets in queue
    */
-  rtems_event_send(tsmac->rxDaemonTid, INTERRUPT_EVENT);
+  rtems_bsdnet_event_send(tsmac->rxDaemonTid, INTERRUPT_EVENT);
 }
 
 void tsmac_stop(struct ifnet *ifp)
@@ -585,7 +585,7 @@ void tsmac_start(struct ifnet *ifp)
 {
   struct tsmac_softc *tsmac = ifp->if_softc;
 
-  rtems_event_send (tsmac->txDaemonTid, START_TRANSMIT_EVENT);
+  rtems_bsdnet_event_send (tsmac->txDaemonTid, START_TRANSMIT_EVENT);
   ifp->if_flags |= IFF_OACTIVE;
 }
 
@@ -797,13 +797,13 @@ rtems_isr tsmac_interrupt_handler(rtems_vector_number vector)
   if (irq_stat & INTR_RX_PKT_RDY)
     {
       tsmac->rxInterrupts++;
-      rtems_event_send(tsmac->rxDaemonTid, INTERRUPT_EVENT);
+      rtems_bsdnet_event_send(tsmac->rxDaemonTid, INTERRUPT_EVENT);
     }
 
   if (irq_stat & INTR_TX_PKT_SENT)
     {
       tsmac->txInterrupts++;
-      rtems_event_send(tsmac->txDaemonTid, INTERRUPT_EVENT);
+      rtems_bsdnet_event_send(tsmac->txDaemonTid, INTERRUPT_EVENT);
     }
 
   rx_stat = tsmacread(LM32_TSMAC_RX_STATUS);
diff --git a/c/src/lib/libbsp/m68k/av5282/network/network.c b/c/src/lib/libbsp/m68k/av5282/network/network.c
index 8045ef4..90c0b4a 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 bb488b3..fa0fa94 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 a8f2c2e..67cd951 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 0279bbd..3ed3bf5 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 1bca1c8..3f5e6d3 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 ed98b4d..7ce20e0 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 acc36ab..62d90f1 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 07132cb..ff2356f 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 475ab22..a29a2ad 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;
 }
 
diff --git a/c/src/lib/libbsp/mips/csb350/network/network.c b/c/src/lib/libbsp/mips/csb350/network/network.c
index 23fb9d3..6821572 100644
--- a/c/src/lib/libbsp/mips/csb350/network/network.c
+++ b/c/src/lib/libbsp/mips/csb350/network/network.c
@@ -507,7 +507,7 @@ void au1x00_emac_start(struct ifnet *ifp)
 {
     au1x00_emac_softc_t *sc = ifp->if_softc;
 
-    rtems_event_send(sc->tx_daemon_tid, START_TX_EVENT);
+    rtems_bsdnet_event_send(sc->tx_daemon_tid, START_TX_EVENT);
     ifp->if_flags |= IFF_OACTIVE;
 }
 
@@ -872,7 +872,7 @@ rtems_isr au1x00_emac_isr (rtems_vector_number v)
         }
     }
     if (rx_flag != 0) {
-        rtems_event_send(sc->rx_daemon_tid, START_RX_EVENT);
+        rtems_bsdnet_event_send(sc->rx_daemon_tid, START_RX_EVENT);
     }
 
     /* transmit interrupt */
@@ -901,7 +901,7 @@ rtems_isr au1x00_emac_isr (rtems_vector_number v)
         }
     }
     if (tx_flag != 0) {
-        rtems_event_send(sc->tx_daemon_tid, START_TX_EVENT);
+        rtems_bsdnet_event_send(sc->tx_daemon_tid, START_TX_EVENT);
     }
 }
 
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 8c1fd74..53f9b54 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<<unit );
+	rtems_bsdnet_event_send( theMvEths[unit].pvt.tid, 1<<unit );
 }
 
 static void mveth_isr_1(rtems_irq_hdl_param arg)
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c b/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c
index ef9447d..b0f90f3 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c
@@ -242,7 +242,7 @@ struct NET_SOFTC *sc = thesc;
 	/* disable interrupts */
 	NET_DISABLE_IRQS(sc);
 
-	rtems_event_send( sc->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 060167a..bbaf148 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 5a10d7b..b22e58d 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 b9939ff..2a03f12 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 e6997b2..5e62896 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 d2b8464..7503be0 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 fec89a1..2b5295b 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 b434e50..b6a5184 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 12d617d..c419acd 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 288cc32..20b490f 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 a98eae0..3db350c 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 5fc0586..878c78f 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;
 }
diff --git a/c/src/lib/libcpu/bfin/network/ethernet.c b/c/src/lib/libcpu/bfin/network/ethernet.c
index 9dc3519..873d105 100644
--- a/c/src/lib/libcpu/bfin/network/ethernet.c
+++ b/c/src/lib/libcpu/bfin/network/ethernet.c
@@ -250,7 +250,7 @@ void bfin_ethernet_rxdma_isr(int vector) {
     rxdmaBase = sc->rxdmaBase;
     status = BFIN_REG16(rxdmaBase, DMA_IRQ_STATUS_OFFSET);
     if (status & DMA_IRQ_STATUS_DMA_DONE)
-        rtems_event_send (sc->rxDaemonTid, INTERRUPT_EVENT);
+        rtems_bsdnet_event_send (sc->rxDaemonTid, INTERRUPT_EVENT);
     BFIN_REG16(rxdmaBase, DMA_IRQ_STATUS_OFFSET) = status;
   }
 }
@@ -266,7 +266,7 @@ void bfin_ethernet_txdma_isr(int vector) {
     txdmaBase = sc->txdmaBase;
     status = BFIN_REG16(txdmaBase, DMA_IRQ_STATUS_OFFSET);
     if (status & DMA_IRQ_STATUS_DMA_DONE)
-        rtems_event_send (sc->txDaemonTid, INTERRUPT_EVENT);
+        rtems_bsdnet_event_send (sc->txDaemonTid, INTERRUPT_EVENT);
     BFIN_REG16(txdmaBase, DMA_IRQ_STATUS_OFFSET) = status;
   }
 }
@@ -720,7 +720,7 @@ static void ethernetStart(struct ifnet *ifp) {
   sc = ifp->if_softc;
 
   ifp->if_flags |= IFF_OACTIVE;
-  rtems_event_send(sc->txDaemonTid, START_TRANSMIT_EVENT);
+  rtems_bsdnet_event_send(sc->txDaemonTid, START_TRANSMIT_EVENT);
 }
 
 /* initialize and start the device */
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c b/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
index 8b740ad..8816d81 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
+++ b/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
@@ -850,7 +850,7 @@ 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);
 }
 
 /*=========================================================================*\
@@ -1168,7 +1168,7 @@ static void tsec_tx_irq_handler
   /*
    * wake up tx Daemon
    */
-  rtems_event_send(sc->txDaemonTid, INTERRUPT_EVENT);
+  rtems_bsdnet_event_send(sc->txDaemonTid, INTERRUPT_EVENT);
 }
 
 /*=========================================================================*\
@@ -1211,7 +1211,7 @@ static void tsec_rx_irq_handler
   /*
    * wake up rx Daemon<
    */
-  rtems_event_send(sc->rxDaemonTid, INTERRUPT_EVENT);
+  rtems_bsdnet_event_send(sc->rxDaemonTid, INTERRUPT_EVENT);
 }
 
 
diff --git a/c/src/libchip/network/cs8900.c b/c/src/libchip/network/cs8900.c
index 9d6a79f..8cd907e 100644
--- a/c/src/libchip/network/cs8900.c
+++ b/c/src/libchip/network/cs8900.c
@@ -470,7 +470,7 @@ cs8900_interrupt (rtems_vector_number v, void *csp)
             if (cs->rx_loaded_len == 1)
             {
               cs8900_trace (cs, CS8900_T_RX_OK, cs->rx_loaded_len);
-              rtems_event_send (cs->rx_task, CS8900_RX_OK_EVENT);
+              rtems_bsdnet_event_send (cs->rx_task, CS8900_RX_OK_EVENT);
             }
           }
           else
@@ -480,7 +480,7 @@ cs8900_interrupt (rtems_vector_number v, void *csp)
             cs8900_trace (cs, CS8900_T_RX_DROPPED, cs->rx_loaded_len);
 
             if (cs->rx_loaded_len == 0)
-              rtems_event_send (cs->rx_task, CS8900_RX_OK_EVENT);
+              rtems_bsdnet_event_send (cs->rx_task, CS8900_RX_OK_EVENT);
           }
         }
         else
@@ -511,7 +511,7 @@ cs8900_interrupt (rtems_vector_number v, void *csp)
 
           cs->tx_active = 0;
 
-          rtems_event_send (cs->tx_task, CS8900_TX_OK_EVENT);
+          rtems_bsdnet_event_send (cs->tx_task, CS8900_TX_OK_EVENT);
         }
         break;
 
@@ -526,14 +526,14 @@ cs8900_interrupt (rtems_vector_number v, void *csp)
           if (cs->tx_active)
           {
             ++cs->eth_stats.tx_rdy4tx;
-            rtems_event_send (cs->tx_task, CS8900_TX_WAIT_EVENT);
+            rtems_bsdnet_event_send (cs->tx_task, CS8900_TX_WAIT_EVENT);
           }
         }
         else if (isq & CS8900_BUFFER_EVENT_TX_UNDERRUN)
         {
           ++cs->eth_stats.tx_underrun_errors;
           if (cs->tx_active)
-            rtems_event_send (cs->tx_task, CS8900_TX_OK_EVENT);
+            rtems_bsdnet_event_send (cs->tx_task, CS8900_TX_OK_EVENT);
         }
         else if (isq & CS8900_BUFFER_EVENT_SW_INT)
         {
@@ -871,7 +871,7 @@ cs8900_start (struct ifnet *ifp)
 
   ifp->if_flags |= IFF_OACTIVE;
 
-  rtems_event_send (cs->tx_task, CS8900_TX_START_EVENT);
+  rtems_bsdnet_event_send (cs->tx_task, CS8900_TX_START_EVENT);
 }
 
 static void
diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c
index 51d22c3..997b34c 100644
--- a/c/src/libchip/network/dec21140.c
+++ b/c/src/libchip/network/dec21140.c
@@ -373,7 +373,7 @@ dec21140Enet_interrupt_handler ( struct dec21140_softc *sc )
    if( status & 0x000000c0 )
    {
       sc->rxInterrupts++;
-      rtems_event_send(rxDaemonTid, sc->ioevent);
+      rtems_bsdnet_event_send(rxDaemonTid, sc->ioevent);
    }
 }
 
@@ -718,7 +718,7 @@ static void
 dec21140_start (struct ifnet *ifp)
 {
    struct dec21140_softc *sc = ifp->if_softc;
-   rtems_event_send( txDaemonTid, sc->ioevent );
+   rtems_bsdnet_event_send( txDaemonTid, sc->ioevent );
    ifp->if_flags |= IFF_OACTIVE;
 }
 
diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c
index 74403fd..0daa787 100644
--- a/c/src/libchip/network/elnk.c
+++ b/c/src/libchip/network/elnk.c
@@ -1930,7 +1930,7 @@ elnk_interrupt_handler ( struct elnk_softc *sc )
          printk("etherlink : unit elnk%d rx\n", sc->xl_unit );
 #endif
          /* received packets */
-         rtems_event_send(rxDaemonTid, sc->ioevent);
+         rtems_bsdnet_event_send(rxDaemonTid, sc->ioevent);
       }
 
       if( (status & XL_STAT_DOWN_COMPLETE) || (status & XL_STAT_TX_COMPLETE) )
@@ -2013,7 +2013,7 @@ elnk_interrupt_handler ( struct elnk_softc *sc )
 
             /* wake up the tx daemon once so we're sure this last chain
                will be freed */
-            rtems_event_send( txDaemonTid, sc->ioevent );
+            rtems_bsdnet_event_send( txDaemonTid, sc->ioevent );
 #if 0
             printk("unit elnk%d tx done\n", sc->xl_unit );
 #endif
@@ -2338,10 +2338,10 @@ elnk_rxDaemon (void *arg)
          /*
          ** If more events are pending, service them before we go back to sleep
          */
-         if( rtems_event_receive( RTEMS_ALL_EVENTS,
-                                  RTEMS_NO_WAIT | RTEMS_EVENT_ANY,
-                                  0,
-                                  &events ) == RTEMS_UNSATISFIED ) break;
+         if( rtems_event_system_receive( RTEMS_ALL_EVENTS,
+                                         RTEMS_NO_WAIT | RTEMS_EVENT_ANY,
+                                         0,
+                                         &events ) == RTEMS_UNSATISFIED ) break;
       }
    }
 }
@@ -2612,7 +2612,7 @@ elnk_start (struct ifnet *ifp)
    printk("unit %i tx signaled\n", sc->xl_unit );
 #endif
    ifp->if_flags |= IFF_OACTIVE;
-   rtems_event_send( txDaemonTid, sc->ioevent );
+   rtems_bsdnet_event_send( txDaemonTid, sc->ioevent );
 }
 
 
diff --git a/c/src/libchip/network/greth.c b/c/src/libchip/network/greth.c
index 03db517..54d55ed 100644
--- a/c/src/libchip/network/greth.c
+++ b/c/src/libchip/network/greth.c
@@ -211,7 +211,7 @@ void greth_interrupt_handler (void *arg)
 
         /* Send the event(s) */
         if ( events )
-                rtems_event_send (greth->daemonTid, events);
+                rtems_bsdnet_event_send (greth->daemonTid, events);
 }
 
 static uint32_t read_mii(uint32_t phy_addr, uint32_t reg_addr)
diff --git a/c/src/libchip/network/i82586.c b/c/src/libchip/network/i82586.c
index 4dd4a1d..8ea8a16 100644
--- a/c/src/libchip/network/i82586.c
+++ b/c/src/libchip/network/i82586.c
@@ -732,7 +732,7 @@ i82586_intr(rtems_vector_number vec, void *arg)
    * Wake the task to handle the interrupt. It will
    * enabled the interrupts when it has finished.
    */
-  rtems_event_send (sc->intr_task, i82586_WAKE_EVENT);
+  rtems_bsdnet_event_send (sc->intr_task, i82586_WAKE_EVENT);
 }
 
 /*
@@ -1310,7 +1310,7 @@ i82586_start(struct ifnet *ifp)
   I82586_TRACE(sc, I82586_TX_REQ, sc->xmit_busy);
 #endif
 
-  rtems_event_send (sc->tx_task, i82586_TX_EVENT);
+  rtems_bsdnet_event_send (sc->tx_task, i82586_TX_EVENT);
 }
 
 static void
diff --git a/c/src/libchip/network/if_dc.c b/c/src/libchip/network/if_dc.c
index 88032aa..1563be5 100644
--- a/c/src/libchip/network/if_dc.c
+++ b/c/src/libchip/network/if_dc.c
@@ -3122,7 +3122,7 @@ dc_intr(void* arg)
 	/* Disable interrupts. */
 	CSR_WRITE_4(sc, DC_IMR, 0x00000000);
 
-	rtems_event_send(sc->daemontid, IRQ_EVENT);
+	rtems_bsdnet_event_send(sc->daemontid, IRQ_EVENT);
 #if 0
 	if (sc->suspended) {
 		return;
diff --git a/c/src/libchip/network/if_fxp.c b/c/src/libchip/network/if_fxp.c
index c16ee77..6bcbd8b 100644
--- a/c/src/libchip/network/if_fxp.c
+++ b/c/src/libchip/network/if_fxp.c
@@ -1282,7 +1282,7 @@ static rtems_isr fxp_intr(rtems_vector_number v)
   /*
    * send event to deamon
    */
-  rtems_event_send (sc->daemonTid, INTERRUPT_EVENT);
+  rtems_bsdnet_event_send (sc->daemonTid, INTERRUPT_EVENT);
 }
 
 static void fxp_daemon(void *xsc)
diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c
index cac2568..d7c0b05 100644
--- a/c/src/libchip/network/open_eth.c
+++ b/c/src/libchip/network/open_eth.c
@@ -176,13 +176,13 @@ open_eth_interrupt_handler (rtems_vector_number v)
     if (status & (OETH_INT_RXF | OETH_INT_RXE))
       {
 	  oc.rxInterrupts++;
-	  rtems_event_send (oc.rxDaemonTid, INTERRUPT_EVENT);
+	  rtems_bsdnet_event_send (oc.rxDaemonTid, INTERRUPT_EVENT);
       }
 #ifdef OETH_SUSPEND_NOTXBUF
     if (status & (OETH_INT_MASK_TXB | OETH_INT_MASK_TXC | OETH_INT_MASK_TXE))
       {
 	  oc.txInterrupts++;
-	  rtems_event_send (oc.txDaemonTid, OPEN_ETH_TX_WAIT_EVENT);
+	  rtems_bsdnet_event_send (oc.txDaemonTid, OPEN_ETH_TX_WAIT_EVENT);
       }
 #endif
       /*
@@ -561,7 +561,7 @@ open_eth_start (struct ifnet *ifp)
 {
     struct open_eth_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/libchip/network/smc91111.c b/c/src/libchip/network/smc91111.c
index 3e87935..2332688 100644
--- a/c/src/libchip/network/smc91111.c
+++ b/c/src/libchip/network/smc91111.c
@@ -118,13 +118,13 @@ void lan91cxx_interrupt_handler(void *arg)
 			put_reg(cpd, LAN91CXX_INTERRUPT,
 				(irq & 0xff00) | LAN91CXX_INTERRUPT_TX_INT);
 
-			/*rtems_event_send (cpd->txDaemonTid, SMC91111_INTERRUPT_EVENT); */
+			/*rtems_bsdnet_event_send (cpd->txDaemonTid, SMC91111_INTERRUPT_EVENT); */
 			/*put_reg(cpd, LAN91CXX_INTERRUPT, (irq & 0xff00) | LAN91CXX_INTERRUPT_TX_INT); */
-			/*rtems_event_send (cpd->txDaemonTid, SMC91111_TX_WAIT_EVENT); */
+			/*rtems_bsdnet_event_send (cpd->txDaemonTid, SMC91111_TX_WAIT_EVENT); */
 		}
 		if (event & LAN91CXX_INTERRUPT_RCV_INT) {
 			db_printf("#*rx irq\n");
-			rtems_event_send(cpd->rxDaemonTid,
+			rtems_bsdnet_event_send(cpd->rxDaemonTid,
 					 SMC91111_INTERRUPT_EVENT);
 		}
 		if (event &
@@ -699,7 +699,7 @@ static void smc91111_start(struct ifnet *ifp)
 	if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
 		return;
 
-	rtems_event_send(cpd->txDaemonTid, START_TRANSMIT_EVENT);
+	rtems_bsdnet_event_send(cpd->txDaemonTid, START_TRANSMIT_EVENT);
 	ifp->if_flags |= IFF_OACTIVE;
 
 }
diff --git a/c/src/libchip/network/sonic.c b/c/src/libchip/network/sonic.c
index 183dfb4..960fdcd 100644
--- a/c/src/libchip/network/sonic.c
+++ b/c/src/libchip/network/sonic.c
@@ -426,7 +426,7 @@ SONIC_STATIC rtems_isr sonic_interrupt_handler (rtems_vector_number v)
   if (imr & isr & (IMR_PRXEN | IMR_RBAEEN)) {
     imr &= ~(IMR_PRXEN | IMR_RBAEEN);
     sc->rxInterrupts++;
-    rtems_event_send (sc->rxDaemonTid, INTERRUPT_EVENT);
+    rtems_bsdnet_event_send (sc->rxDaemonTid, INTERRUPT_EVENT);
     (*sc->write_register)( rp, SONIC_REG_IMR, imr );
     (*sc->write_register)( rp, SONIC_REG_ISR, isr & ISR_PKTRX );
   }
@@ -438,7 +438,7 @@ SONIC_STATIC rtems_isr sonic_interrupt_handler (rtems_vector_number v)
    */
   if (imr & isr & (IMR_PINTEN | IMR_TXEREN)) {
     sc->txInterrupts++;
-    rtems_event_send (sc->txDaemonTid, INTERRUPT_EVENT);
+    rtems_bsdnet_event_send (sc->txDaemonTid, INTERRUPT_EVENT);
     (*sc->write_register)( rp, SONIC_REG_ISR, ISR_PINT | ISR_TXDN | ISR_TXER );
   }
 
@@ -1416,7 +1416,7 @@ SONIC_STATIC void sonic_start(struct ifnet *ifp)
 {
   struct sonic_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/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
index 27c6fb4..6bd2682 100644
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -152,6 +152,14 @@ rtems_status_code rtems_bsdnet_event_receive (
   rtems_event_set *event_out
 );
 
+static inline rtems_status_code rtems_bsdnet_event_send (
+  rtems_id        task_id,
+  rtems_event_set event_in
+)
+{
+  return rtems_event_system_send (task_id, event_in);
+}
+
 /*
  * Network configuration
  */
@@ -182,8 +190,8 @@ int ioctl (int, ioctl_command_t, ...);
  * tries to use these events or if the `sleep'
  * events are equal to any of the NETISR * events.
  */
-#define SBWAIT_EVENT   RTEMS_EVENT_24
-#define SOSLEEP_EVENT  RTEMS_EVENT_25
+#define SBWAIT_EVENT   RTEMS_EVENT_SYSTEM_NETWORK_SBWAIT
+#define SOSLEEP_EVENT  RTEMS_EVENT_SYSTEM_NETWORK_SOSLEEP
 #define NETISR_IP_EVENT        (1L << NETISR_IP)
 #define NETISR_ARP_EVENT       (1L << NETISR_ARP)
 #define NETISR_EVENTS  (NETISR_IP_EVENT|NETISR_ARP_EVENT)
diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c
index d5868e4..09240a4 100644
--- a/cpukit/libnetworking/rtems/rtems_glue.c
+++ b/cpukit/libnetworking/rtems/rtems_glue.c
@@ -405,7 +405,7 @@ sbwait(struct sockbuf *sb)
 	 * The sleep/wakeup synchronization in the FreeBSD
 	 * kernel has no memory.
 	 */
-	rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events);
+	rtems_event_system_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events);
 
 	/*
 	 * Set this task as the target of the wakeup operation.
@@ -426,7 +426,7 @@ sbwait(struct sockbuf *sb)
 	/*
 	 * Wait for the wakeup event.
 	 */
-	sc = rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, sb->sb_timeo, &events);
+	sc = rtems_event_system_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, sb->sb_timeo, &events);
 
 	/*
 	 * Reobtain the network semaphore.
@@ -454,7 +454,7 @@ sowakeup(
 {
 	if (sb->sb_flags & SB_WAIT) {
 		sb->sb_flags &= ~SB_WAIT;
-		rtems_event_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
+		rtems_event_system_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
 	}
 	if (sb->sb_wakeup) {
 		(*sb->sb_wakeup) (so, sb->sb_wakeuparg);
@@ -491,7 +491,7 @@ soconnsleep (struct socket *so)
 	 * The sleep/wakeup synchronization in the FreeBSD
 	 * kernel has no memory.
 	 */
-	rtems_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events);
+	rtems_event_system_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events);
 
 	/*
 	 * Set this task as the target of the wakeup operation.
@@ -525,7 +525,7 @@ void
 soconnwakeup (struct socket *so)
 {
 	if (so->so_pgid)
-		rtems_event_send (so->so_pgid, SOSLEEP_EVENT);
+		rtems_event_system_send (so->so_pgid, SOSLEEP_EVENT);
 }
 
 /*
@@ -535,7 +535,7 @@ soconnwakeup (struct socket *so)
 void
 rtems_bsdnet_schednetisr (int n)
 {
-	rtems_event_send (networkDaemonTid, 1 << n);
+	rtems_event_system_send (networkDaemonTid, 1 << n);
 }
 
 /*
@@ -680,7 +680,7 @@ rtems_status_code rtems_bsdnet_event_receive (
 	rtems_status_code sc;
 
 	rtems_bsdnet_semaphore_release ();
-	sc = rtems_event_receive (event_in, option_set, ticks, event_out);
+	sc = rtems_event_system_receive (event_in, option_set, ticks, event_out);
 	rtems_bsdnet_semaphore_obtain ();
 	return sc;
 }
diff --git a/cpukit/libnetworking/rtems/rtems_select.c b/cpukit/libnetworking/rtems/rtems_select.c
index 19a67ae..5256651 100644
--- a/cpukit/libnetworking/rtems/rtems_select.c
+++ b/cpukit/libnetworking/rtems/rtems_select.c
@@ -170,7 +170,7 @@ select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct t
 #undef getbits
 
 	rtems_task_ident (RTEMS_SELF, 0, &tid);
-	rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events);
+	rtems_event_system_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events);
 	for (;;) {
 		rtems_bsdnet_semaphore_obtain ();
 		error = selscan(tid, ibits, obits, nfds, &retval);
@@ -184,7 +184,7 @@ select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct t
 				break;
 			then = now;
 		}
-		rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, timo, &events);
+		rtems_event_system_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, timo, &events);
 	}
 
 #define putbits(name,i) if (name) *name = ob[i]
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/rtems/include/rtems/rtems/event.h
index 5d1b254..2154738 100644
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/cpukit/rtems/include/rtems/rtems/event.h
@@ -223,6 +223,16 @@ rtems_status_code rtems_event_receive (
  */
 
 /**
+ * @brief Reserved system event for network SBWAIT usage.
+ */
+#define RTEMS_EVENT_SYSTEM_NETWORK_SBWAIT RTEMS_EVENT_24
+
+/**
+ * @brief Reserved system event for network SOSLEEP usage.
+ */
+#define RTEMS_EVENT_SYSTEM_NETWORK_SOSLEEP RTEMS_EVENT_25
+
+/**
  * @brief Reserved system event for transient usage.
  */
 #define RTEMS_EVENT_SYSTEM_TRANSIENT RTEMS_EVENT_31
-- 
1.7.7




More information about the devel mailing list