[Commit-gnuradio] r8643 - in usrp2/branches/features/host-ng/host-ng: . apps lib

[jcorgan]

Author: jcorgan
Date: 2008-06-20 12:23:24 -0600 (Fri, 20 Jun 2008)
New Revision: 8643

Modified:
   usrp2/branches/features/host-ng/host-ng/apps/Makefile.am
   usrp2/branches/features/host-ng/host-ng/apps/test_usrp2.cc
   usrp2/branches/features/host-ng/host-ng/configure.ac
   usrp2/branches/features/host-ng/host-ng/lib/Makefile.am
   usrp2/branches/features/host-ng/host-ng/lib/usrp2_thread.cc
Log:
Modify to use new libgruel

Modified: usrp2/branches/features/host-ng/host-ng/apps/Makefile.am
===================================================================
--- usrp2/branches/features/host-ng/host-ng/apps/Makefile.am    2008-06-20 
18:14:47 UTC (rev 8642)
+++ usrp2/branches/features/host-ng/host-ng/apps/Makefile.am    2008-06-20 
18:23:24 UTC (rev 8643)
@@ -21,8 +21,7 @@
 INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES)
 
 LDADD = \
-       ../lib/libusrp2ng.la \
-       $(GNURADIO_CORE_LIBS)
+       ../lib/libusrp2ng.la
 
 noinst_PROGRAMS = \
        test_usrp2

Modified: usrp2/branches/features/host-ng/host-ng/apps/test_usrp2.cc
===================================================================
--- usrp2/branches/features/host-ng/host-ng/apps/test_usrp2.cc  2008-06-20 
18:14:47 UTC (rev 8642)
+++ usrp2/branches/features/host-ng/host-ng/apps/test_usrp2.cc  2008-06-20 
18:23:24 UTC (rev 8643)
@@ -101,11 +101,11 @@
       exit(1);
     }
   }
-  
+#if 0  
   gr_rt_status_t rt = gr_enable_realtime_scheduling();
   if (rt != RT_OK)
     std::cerr << "Failed to enable realtime scheduling" << std::endl;
-
+#endif
   usrp2::usrp2::sptr u2 = usrp2::usrp2::make(interface, mac_addr_str);
   
   if (!u2->set_rx_gain(rx_gain)){

Modified: usrp2/branches/features/host-ng/host-ng/configure.ac
===================================================================
--- usrp2/branches/features/host-ng/host-ng/configure.ac        2008-06-20 
18:14:47 UTC (rev 8642)
+++ usrp2/branches/features/host-ng/host-ng/configure.ac        2008-06-20 
18:23:24 UTC (rev 8643)
@@ -160,6 +160,10 @@
 #endif
 ])
 
+PKG_CHECK_MODULES(GRUEL, gruel > 3)
+AC_SUBST(GRUEL_LIBS)
+AC_SUBST(GRUEL_CFLAGS)
+
 dnl Do we have "dot", part of the graphviz package from AT&T?
 dnl Doxgen will use it to draw pretty diagrams ;-)
 AC_CHECK_PROG(HAVE_DOT, [dot],[YES],[NO])

Modified: usrp2/branches/features/host-ng/host-ng/lib/Makefile.am
===================================================================
--- usrp2/branches/features/host-ng/host-ng/lib/Makefile.am     2008-06-20 
18:14:47 UTC (rev 8642)
+++ usrp2/branches/features/host-ng/host-ng/lib/Makefile.am     2008-06-20 
18:23:24 UTC (rev 8643)
@@ -36,7 +36,8 @@
        usrp2_thread.cc
 
 libusrp2ng_la_LIBADD = \
-       $(GR_OMNITHREAD_LIBS)
+       $(GR_OMNITHREAD_LIBS) \
+       $(GRUEL_LIBS)
 
 # Private headers not needed for above the API development
 noinst_HEADERS = \

Modified: usrp2/branches/features/host-ng/host-ng/lib/usrp2_thread.cc
===================================================================
--- usrp2/branches/features/host-ng/host-ng/lib/usrp2_thread.cc 2008-06-20 
18:14:47 UTC (rev 8642)
+++ usrp2/branches/features/host-ng/host-ng/lib/usrp2_thread.cc 2008-06-20 
18:23:24 UTC (rev 8643)
@@ -22,6 +22,7 @@
 
 #include "usrp2_thread.h"
 #include "usrp2_impl.h"
+#include <gruel/realtime.h>
 #include <iostream>
 
 #define USRP2_THREAD_DEBUG 1
@@ -49,13 +50,9 @@
   void *
   usrp2_thread::run_undetached(void *arg)
   {
-#if 0
-    // FIXME hoist this from gnuradio-core into another library.
-    gr_rt_status_t rt = gr_enable_realtime_scheduling();
-    if (rt != RT_OK)
-      std::cerr << "failed to enable realtime scheduling\n";
-#endif
-    
+    if (gruel::enable_realtime_scheduling() != gruel::RT_OK)
+      std::cerr << "usrp2: failed to enable realtime scheduling" << std::endl; 
   
+
     // This is the first code to run in the new thread context.
     d_u2->bg_loop();