[Commit-gnuradio] r7419 - in usrp2/trunk/host: . apps lib

[eb]

Author: eb
Date: 2008-01-13 14:43:20 -0700 (Sun, 13 Jan 2008)
New Revision: 7419

Modified:
   usrp2/trunk/host/Makefile.common
   usrp2/trunk/host/apps/rx_samples.cc
   usrp2/trunk/host/configure.ac
   usrp2/trunk/host/lib/usrp2_basic.cc
Log:
Tried running rx_samples with real-time priority, but it didn't help
the dropped packet situation.


Modified: usrp2/trunk/host/Makefile.common
===================================================================
--- usrp2/trunk/host/Makefile.common    2008-01-13 20:42:18 UTC (rev 7418)
+++ usrp2/trunk/host/Makefile.common    2008-01-13 21:43:20 UTC (rev 7419)
@@ -20,4 +20,5 @@
 
 STD_DEFINES_AND_INCLUDES = \
   -I$(top_srcdir)/../firmware/include \
-  -I$(top_srcdir)/lib
+  -I$(top_srcdir)/lib \
+  $(GNURADIO_CORE_CFLAGS)

Modified: usrp2/trunk/host/apps/rx_samples.cc
===================================================================
--- usrp2/trunk/host/apps/rx_samples.cc 2008-01-13 20:42:18 UTC (rev 7418)
+++ usrp2/trunk/host/apps/rx_samples.cc 2008-01-13 21:43:20 UTC (rev 7419)
@@ -28,7 +28,9 @@
 #include <signal.h>
 #include <stdexcept>
 #include "gri_if_stats.h"
+#include <gr_realtime.h>
 
+
 typedef std::complex<float> fcomplex;
 
 static volatile bool signaled = false;
@@ -214,6 +216,11 @@
   u2_mac_addr_t which = r[0].addr;     // pick the first one
 
 
+  gr_rt_status_t rt = gr_enable_realtime_scheduling();
+  if (rt != RT_OK)
+    std::cerr << "failed to enable realtime scheduling\n";
+
+
   gri_if_stats start, stop;
   gri_get_if_stats(interface, &start);
 

Modified: usrp2/trunk/host/configure.ac
===================================================================
--- usrp2/trunk/host/configure.ac       2008-01-13 20:42:18 UTC (rev 7418)
+++ usrp2/trunk/host/configure.ac       2008-01-13 21:43:20 UTC (rev 7419)
@@ -194,6 +194,11 @@
 dnl defines BOOST_CFLAGS
 GR_REQUIRE_BOOST_INCLUDES
 
+dnl so we can use some utilities. FIXME hoist them out
+PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
+LIBS="$LIBS $GNURADIO_CORE_LIBS"
+
+
 # If this is being done from a subversion tree, create variables
 GR_SUBVERSION
 

Modified: usrp2/trunk/host/lib/usrp2_basic.cc
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.cc 2008-01-13 20:42:18 UTC (rev 7418)
+++ usrp2/trunk/host/lib/usrp2_basic.cc 2008-01-13 21:43:20 UTC (rev 7419)
@@ -448,9 +448,7 @@
   os << x.addr;
 
   char buf[128];
-  snprintf(buf, sizeof(buf),
-          " hw_rev = 0x%04x serial_no = %.8s",
-          x.hw_rev, x.serial_no);
+  snprintf(buf, sizeof(buf)," hw_rev = 0x%04x", x.hw_rev);
 
   os << buf;
   return os;