[Commit-gnuradio] r11386 - in gnuradio/branches/developers/jcorgan/usrp-headers: . config usrp usrp/host usrp/host/lib usrp/limbo usrp/limbo/apps-inband usrp/limbo/inband

[jcorgan]

Author: jcorgan
Date: 2009-07-08 19:26:40 -0600 (Wed, 08 Jul 2009)
New Revision: 11386

Added:
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/limbo/
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/limbo/apps-inband/
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/limbo/inband/
Removed:
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/apps-inband/
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/inband/
Modified:
   gnuradio/branches/developers/jcorgan/usrp-headers/Makefile.common
   gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/Makefile.am
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am
Log:
Moved inband code into limbo, branch passes make check.

Modified: gnuradio/branches/developers/jcorgan/usrp-headers/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/Makefile.common   
2009-07-09 00:58:13 UTC (rev 11385)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/Makefile.common   
2009-07-09 01:26:40 UTC (rev 11386)
@@ -81,10 +81,6 @@
 USRP_INCLUDES = @usrp_INCLUDES@
 USRP_LA = @usrp_LA@
 
-# How to link in usrp-inband library from inside the tree
-USRP_INBAND_INCLUDES = @usrp_inband_INCLUDES@
-USRP_INBAND_LA = @usrp_inband_LA@
-
 # How to link the PMT library from inside the tree
 PMT_INCLUDES = @pmt_INCLUDES@
 PMT_LA = @pmt_LA@

Modified: gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4        
2009-07-09 00:58:13 UTC (rev 11385)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/config/grc_usrp.m4        
2009-07-09 01:26:40 UTC (rev 11386)
@@ -20,12 +20,10 @@
 AC_DEFUN([GRC_USRP],[
     GRC_ENABLE(usrp)
 
-    GRC_WITH(usrp, [GRC_WITH_PKG_CONFIG_CHECK(usrp-inband)])
+    GRC_WITH(usrp)
 
-    dnl Don't do usrp if omnithread, mblock, or pmt skipped
+    dnl Don't do usrp if omnithread skipped
     GRC_CHECK_DEPENDENCY(usrp, omnithread)
-    GRC_CHECK_DEPENDENCY(usrp, mblock)
-    GRC_CHECK_DEPENDENCY(usrp, pmt)
 
     dnl Make sure the fast usb technique is set, OS dependent.
     dnl This is always performed, since it puts out CLI flags.
@@ -46,9 +44,6 @@
         AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
         AC_CHECK_FUNCS([sigaction snprintf])
 
-       dnl Don't do usrp if guile not available (inband requires it)
-       GRC_CHECK_GUILE(usrp)
-
        dnl Make sure libusb is installed; required for legacy USB
         USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to find dependency 
libusb.])])
 
@@ -62,18 +57,9 @@
                -I\${abs_top_builddir}/usrp/host/include \
                -I\${abs_top_srcdir}/usrp/firmware/include"
         usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la"
-       usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband"
-       
usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp-inband.la"
     fi
-    #-I\${abs_top_srcdir}/usrp/host/lib/legacy
-    #-I\${abs_top_builddir}/usrp/host/lib/legacy"
 
-    dnl Include the usrp-inband INCLUDES and LA
-    AC_SUBST(usrp_inband_INCLUDES)
-    AC_SUBST(usrp_inband_LA)
-
-    dnl There are 2 pkg-config files (usrp, and usrp-inband); the one
-    dnl for usrp requires omnithread for Darwin only.  Create a variable
+    dnl There pkg-config file for usrp requires omnithread for Darwin only.  
Create a variable
     dnl for just the usrp.pc.in case.
     case "$host_os" in
       darwin*)
@@ -88,7 +74,6 @@
     AC_CONFIG_FILES([ \
        usrp/Makefile \
        usrp/usrp.pc \
-       usrp/usrp-inband.pc \
         usrp/usrp.iss \
         usrp/doc/Doxyfile \
         usrp/doc/Makefile \

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/Makefile.am     
2009-07-09 00:58:13 UTC (rev 11385)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/Makefile.am     
2009-07-09 01:26:40 UTC (rev 11386)
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = misc lib include apps #apps-inband
+SUBDIRS = misc lib include apps
 
 if PYTHON
 SUBDIRS += swig

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am 
2009-07-09 00:58:13 UTC (rev 11385)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/Makefile.am 
2009-07-09 01:26:40 UTC (rev 11386)
@@ -20,5 +20,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = legacy #inband
-
+SUBDIRS = legacy
\ No newline at end of file


Property changes on: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/limbo/apps-inband
___________________________________________________________________
Added: ignore
   + 
Added: svn:ignore
   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.dat
.*.swp
usrper
usrper2
test_input
test_fusb
test_usrp
test_usrp0
test_usrp_standard_rx
test_usrp_standard_tx
test_usrp_standard_2tx
test_usrp_inband_timestamps
test_usrp_inband_registers
test_usrp_inband_rx
test_usrp_inband_2rx
test_usrp_inband_tx
test_usrp_inband_2tx
test_usrp_basic_rx
check_order_quickly
usrp_cal_dc_offset
test_usrp_inband_cs
read_packets
test_usrp_inband_ping
test_usrp_inband_underrun
test_usrp_inband_overrun
gmac_mbh.cc
test_gmac_tx

Added: svn:mergeinfo
   + /gnuradio/branches/developers/eb/t348/usrp/host/apps-inband:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/apps-inband:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/apps-inband:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/apps-inband:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/apps-inband:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/apps-inband:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/apps-inband:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/apps-inband:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/apps-inband:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/apps-inband:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/apps-inband:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/apps-inband:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/apps-inband:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/apps-inband:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/apps-inband:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/apps-inband:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/apps-inband:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/apps-inband:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/apps-inband:11235-11360


Property changes on: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/limbo/inband
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.swp
*.dat
test_fusb
std_paths.h
usrp_dbid.py
usrp_dbid.h
usrp_dbid.cc
usrp_server_mbh.cc
test_inband
test_usrp_inband
test_usrp_tx
*_mbh.cc

Added: svn:mergeinfo
   + /gnuradio/branches/developers/eb/t348/usrp/host/lib/inband:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/inband:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/inband:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/inband:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/inband:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/inband:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/inband:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/inband:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/inband:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/inband:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/inband:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/inband:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/inband:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/inband:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/inband:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/inband:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/inband:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/inband:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/inband:11235-11360