[Commit-gnuradio] r8498 - usrp2/trunk/host/lib

[eb]

Author: eb
Date: 2008-05-25 20:41:51 -0600 (Sun, 25 May 2008)
New Revision: 8498

Removed:
   usrp2/trunk/host/lib/gri_ethernet_pfring.cc
   usrp2/trunk/host/lib/gri_ethernet_pfring.h
   usrp2/trunk/host/lib/pfring.h
   usrp2/trunk/host/lib/ring.h
Modified:
   usrp2/trunk/host/lib/Makefile.am
   usrp2/trunk/host/lib/usrp2_basic.cc
   usrp2/trunk/host/lib/usrp2_basic.h
Log:
removed pf_ring stuff

Modified: usrp2/trunk/host/lib/Makefile.am
===================================================================
--- usrp2/trunk/host/lib/Makefile.am    2008-05-26 01:37:23 UTC (rev 8497)
+++ usrp2/trunk/host/lib/Makefile.am    2008-05-26 02:41:51 UTC (rev 8498)
@@ -22,13 +22,8 @@
 lib_LTLIBRARIES = \
        libusrp2.la
 
-noinst_LTLIBRARIES = \
-       libpfring.la
-
-
 libusrp2_la_SOURCES = \
        gri_ethernet.cc \
-       gri_ethernet_pfring.cc \
        gri_if_stats.cc \
        gri_pktfilter.cc \
        sample_buffer.cc \
@@ -36,16 +31,11 @@
        usrp2_basic.cc \
        usrp2_basic_thread.cc
 
-libpfring_la_SOURCES = \
-       pfring.c
-
 libusrp2_la_LIBADD = \
-       libpfring.la \
        $(GR_OMNITHREAD_LIBS)
 
 include_HEADERS = \
        gri_ethernet.h \
-       gri_ethernet_pfring.h \
        gri_if_stats.h \
        gri_pktfilter.h \
        ring_buffer.h \

Deleted: usrp2/trunk/host/lib/gri_ethernet_pfring.cc

Deleted: usrp2/trunk/host/lib/gri_ethernet_pfring.h

Deleted: usrp2/trunk/host/lib/pfring.h

Deleted: usrp2/trunk/host/lib/ring.h

Modified: usrp2/trunk/host/lib/usrp2_basic.cc
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.cc 2008-05-26 01:37:23 UTC (rev 8497)
+++ usrp2/trunk/host/lib/usrp2_basic.cc 2008-05-26 02:41:51 UTC (rev 8498)
@@ -22,7 +22,6 @@
 #include "usrp2_basic.h"
 #include "usrp2_basic_thread.h"
 #include "gri_ethernet.h"
-#include "gri_ethernet_pfring.h"       // FIXME
 #include "gri_pktfilter.h"
 #include <usrp2_types.h>
 #include <usrp2_eth_packet.h>
@@ -68,7 +67,7 @@
 }
 
 usrp2_basic::usrp2_basic(const std::string &ifc, const u2_mac_addr_t &addr)
-  : d_ethernet(new GRI_ETHERNET()), d_pf(0), d_seqno(0), d_next_rid(0),
+  : d_ethernet(new gri_ethernet()), d_pf(0), d_seqno(0), d_next_rid(0),
     d_rx_started(false), d_tx_started(false), d_thread(0), 
     d_rx_samples(65535, 255), d_tx_samples(65535, 255)
 {
@@ -119,7 +118,7 @@
   gri_ethernet *enet = 0;
   gri_pktfilter *pf = 0;
       
-  enet = new GRI_ETHERNET();
+  enet = new gri_ethernet();
   if (!enet->open(ifc, htons(U2_ETHERTYPE)))
     goto bail;
 

Modified: usrp2/trunk/host/lib/usrp2_basic.h
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.h  2008-05-26 01:37:23 UTC (rev 8497)
+++ usrp2/trunk/host/lib/usrp2_basic.h  2008-05-26 02:41:51 UTC (rev 8498)
@@ -27,11 +27,8 @@
 #include "sample_buffer.h"
 
 class gri_ethernet;
-class gri_ethernet_pfring;
 class gri_pktfilter;
 
-#define GRI_ETHERNET gri_ethernet
-
 class usrp2_basic;
 typedef boost::shared_ptr<usrp2_basic> usrp2_basic_sptr;
 
@@ -46,7 +43,7 @@
   friend class usrp2_basic_thread;
   usrp2_basic(const std::string &ifc, const u2_mac_addr_t &addr);
   
-  GRI_ETHERNET *d_ethernet;
+  gri_ethernet *d_ethernet;
   gri_pktfilter        *d_pf;
   int           d_seqno;
   int           d_next_rid;