From c276a4ffee9314d2528166547abfd2c09d29713f Mon Sep 17 00:00:00 2001 From: jcorgan Date: Thu, 9 Jul 2009 02:55:51 +0000 Subject: [PATCH] Merged r11377:11390 from jcorgan/usrp-headers in to trunk. * Public USRP(1) header files are now in their own source directory and install into $(includedir)/usrp. This was done to avoid name clashes in the top-level include directory. Only users who are developing directly to libusrp in C++ are affected; the GNU Radio C++ and Python APIs are unchanged. The simple change required by this update is to change: #include to #include ...in your source code. * Removed usrp-inband code from tree (put into limbo directory.) This code has become unmaintained and has started to suffer from bitrot. A checkpoint tag has been made for anyone still needing to use it: http://gnuradio.org/svn/gnuradio/tags/checkpoints/trunk-20090708-pre-usrp-reorg The plan during the 3.2->3.3 development cycle is to replace the functions done by the in-band code with extensions to the existing gr-usrp blocks using the new message passing architecture. The USRP hardware FPGA code that provided the inband interface has not been removed; however, it too has become unmaintained and will likely be rewritten/replaced during the 3.3 timeframe. The trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11394 221aa14e-8319-0410-a670-987f0aec2ac5 --- Makefile.common | 4 - config/grc_usrp.m4 | 35 +--- gnuradio-core/src/lib/io/gri_wavfile.cc | 3 +- gr-usrp/apps/Makefile.am | 4 +- gr-usrp/src/usrp_base.cc | 4 +- gr-usrp/src/usrp_base.h | 6 +- gr-usrp/src/usrp_sink_base.cc | 4 +- gr-usrp/src/usrp_sink_base.h | 6 +- gr-usrp/src/usrp_sink_c.cc | 6 +- gr-usrp/src/usrp_sink_s.cc | 6 +- gr-usrp/src/usrp_source_base.cc | 4 +- gr-usrp/src/usrp_source_base.h | 6 +- gr-usrp/src/usrp_source_c.cc | 6 +- gr-usrp/src/usrp_source_s.cc | 6 +- gr-usrp/src/usrp_standard.i | 8 +- gr-usrp/src/usrp_swig.i | 4 +- usrp/Makefile.am | 5 +- usrp/firmware/include/Makefile.am | 4 +- usrp/host/Makefile.am | 2 +- usrp/host/apps/test_usrp_standard_rx.cc | 6 +- usrp/host/apps/test_usrp_standard_tx.cc | 4 +- usrp/host/apps/usrp_cal_dc_offset.cc | 8 +- usrp/host/apps/usrper.cc | 4 +- usrp/host/include/Makefile.am | 23 ++ usrp/host/include/usrp/Makefile.am | 49 +++++ .../{lib/legacy => include/usrp}/db_base.h | 0 .../{lib/legacy => include/usrp}/db_base.i | 2 +- .../{lib/legacy => include/usrp}/db_basic.h | 4 +- .../{lib/legacy => include/usrp}/db_dbs_rx.h | 4 +- .../{lib/legacy => include/usrp}/db_dtt754.h | 4 +- .../{lib/legacy => include/usrp}/db_dtt768.h | 4 +- .../{lib/legacy => include/usrp}/db_flexrf.h | 4 +- .../legacy => include/usrp}/db_flexrf_mimo.h | 4 +- .../{lib/legacy => include/usrp}/db_tv_rx.h | 4 +- .../legacy => include/usrp}/db_xcvr2450.h | 2 +- .../{lib/legacy => include/usrp}/usrp_basic.h | 8 +- .../legacy => include/usrp}/usrp_bytesex.h | 0 .../usrp}/usrp_local_sighandler.h | 0 .../{lib/legacy => include/usrp}/usrp_prims.h | 4 +- .../{lib/legacy => include/usrp}/usrp_slots.h | 0 .../legacy => include/usrp}/usrp_standard.h | 6 +- .../usrp}/usrp_subdev_spec.h | 0 .../usrp}/usrp_tune_result.h | 0 usrp/host/lib/Makefile.am | 153 +++++++++++++- usrp/host/lib/{legacy => }/README_OSX | 0 usrp/host/lib/{legacy => }/ad9862.h | 0 usrp/host/lib/{legacy => }/check_data.py | 0 usrp/host/lib/{legacy => }/circular_buffer.h | 0 .../lib/{legacy => }/circular_linked_list.h | 0 usrp/host/lib/{legacy => }/darwin_libusb.h | 0 usrp/host/lib/{legacy => }/db_base.cc | 4 +- usrp/host/lib/{legacy => }/db_base_impl.h | 8 +- usrp/host/lib/{legacy => }/db_basic.cc | 5 +- usrp/host/lib/{legacy => }/db_boards.cc | 21 +- usrp/host/lib/{legacy => }/db_boards.h | 4 +- usrp/host/lib/{legacy => }/db_dbs_rx.cc | 2 +- usrp/host/lib/{legacy => }/db_dtt754.cc | 2 +- usrp/host/lib/{legacy => }/db_dtt768.cc | 2 +- usrp/host/lib/{legacy => }/db_flexrf.cc | 2 +- usrp/host/lib/{legacy => }/db_flexrf_mimo.cc | 6 +- usrp/host/lib/{legacy => }/db_tv_rx.cc | 2 +- usrp/host/lib/{legacy => }/db_util.cc | 0 usrp/host/lib/{legacy => }/db_util.h | 0 usrp/host/lib/{legacy => }/db_xcvr2450.cc | 2 +- usrp/host/lib/{legacy => }/dump_data.py | 0 usrp/host/lib/{legacy => }/fusb.cc | 0 usrp/host/lib/{legacy => }/fusb.h | 0 usrp/host/lib/{legacy => }/fusb_darwin.cc | 0 usrp/host/lib/{legacy => }/fusb_darwin.h | 0 usrp/host/lib/{legacy => }/fusb_generic.cc | 0 usrp/host/lib/{legacy => }/fusb_generic.h | 0 usrp/host/lib/{legacy => }/fusb_linux.cc | 0 usrp/host/lib/{legacy => }/fusb_linux.h | 0 usrp/host/lib/{legacy => }/fusb_ra_wb.cc | 0 usrp/host/lib/{legacy => }/fusb_ra_wb.h | 0 .../lib/{legacy => }/fusb_sysconfig_darwin.cc | 0 .../{legacy => }/fusb_sysconfig_generic.cc | 0 .../lib/{legacy => }/fusb_sysconfig_linux.cc | 0 .../lib/{legacy => }/fusb_sysconfig_ra_wb.cc | 0 .../lib/{legacy => }/fusb_sysconfig_win32.cc | 0 usrp/host/lib/{legacy => }/fusb_win32.cc | 0 usrp/host/lib/{legacy => }/fusb_win32.h | 0 usrp/host/lib/{legacy => }/gen_usrp_dbid.py | 6 +- usrp/host/lib/legacy/Makefile.am | 196 ------------------ usrp/host/lib/{legacy => limbo}/db_wbx.cc | 0 usrp/host/lib/{legacy => limbo}/db_wbx.h | 0 usrp/host/lib/{legacy => }/md5.c | 0 usrp/host/lib/{legacy => }/md5.h | 0 usrp/host/lib/{legacy => }/mld_threads.h | 0 usrp/host/lib/{legacy => }/rate_to_regval.h | 0 usrp/host/lib/{legacy => }/std_paths.h.in | 0 usrp/host/lib/{legacy => }/usrp_basic.cc | 6 +- usrp/host/lib/{legacy => }/usrp_config.cc | 0 usrp/host/lib/{legacy => }/usrp_config.h | 0 usrp/host/lib/{legacy => }/usrp_dbid.dat | 0 .../lib/{legacy => }/usrp_local_sighandler.cc | 4 +- usrp/host/lib/{legacy => }/usrp_prims.cc | 4 +- usrp/host/lib/{legacy => }/usrp_standard.cc | 6 +- usrp/host/swig/usrp_prims.i | 4 +- usrp/{host => limbo}/apps-inband/Makefile.am | 0 .../apps-inband/read_packets.cc | 0 .../apps-inband/test_usrp_inband_2rx.cc | 0 .../apps-inband/test_usrp_inband_2tx.cc | 0 .../apps-inband/test_usrp_inband_overrun.cc | 0 .../apps-inband/test_usrp_inband_ping.cc | 0 .../apps-inband/test_usrp_inband_registers.cc | 0 .../apps-inband/test_usrp_inband_rx.cc | 0 .../test_usrp_inband_timestamps.cc | 0 .../apps-inband/test_usrp_inband_tx.cc | 0 .../apps-inband/test_usrp_inband_underrun.cc | 0 usrp/{host => limbo}/apps-inband/ui_nco.h | 0 usrp/{host => limbo}/apps-inband/ui_sincos.c | 0 usrp/{host => limbo}/apps-inband/ui_sincos.h | 0 usrp/{host/lib => limbo}/inband/Makefile.am | 0 .../lib => limbo}/inband/dump_packets.py | 0 .../lib => limbo}/inband/gen_test_packets.py | 0 usrp/{host/lib => limbo}/inband/qa_inband.cc | 0 usrp/{host/lib => limbo}/inband/qa_inband.h | 0 .../inband/qa_inband_packet_prims.cc | 0 .../inband/qa_inband_packet_prims.h | 0 .../inband/qa_inband_usrp_server.cc | 0 .../inband/qa_inband_usrp_server.h | 0 .../inband/symbols_usrp_channel.h | 0 .../inband/symbols_usrp_interface_cs.h | 0 .../inband/symbols_usrp_low_level_cs.h | 0 .../lib => limbo}/inband/symbols_usrp_rx.h | 0 .../lib => limbo}/inband/symbols_usrp_rx_cs.h | 0 .../inband/symbols_usrp_server_cs.h | 0 .../lib => limbo}/inband/symbols_usrp_tx.h | 0 .../lib => limbo}/inband/symbols_usrp_tx_cs.h | 0 .../{host/lib => limbo}/inband/test_inband.cc | 0 usrp/{host/lib => limbo}/inband/usb_packet.py | 0 .../inband/usrp_inband_usb_packet.cc | 0 .../inband/usrp_inband_usb_packet.h | 0 .../lib => limbo}/inband/usrp_interface.mbh | 0 usrp/{host/lib => limbo}/inband/usrp_rx.cc | 0 usrp/{host/lib => limbo}/inband/usrp_rx.h | 0 .../lib => limbo}/inband/usrp_rx_stub.cc | 0 .../{host/lib => limbo}/inband/usrp_rx_stub.h | 0 .../{host/lib => limbo}/inband/usrp_server.cc | 0 usrp/{host/lib => limbo}/inband/usrp_server.h | 0 .../lib => limbo}/inband/usrp_server.mbh | 0 usrp/{host/lib => limbo}/inband/usrp_tx.cc | 0 usrp/{host/lib => limbo}/inband/usrp_tx.h | 0 .../lib => limbo}/inband/usrp_tx_stub.cc | 0 .../{host/lib => limbo}/inband/usrp_tx_stub.h | 0 .../inband/usrp_usb_interface.cc | 0 .../lib => limbo}/inband/usrp_usb_interface.h | 0 usrp/usrp-inband.pc.in | 11 - 149 files changed, 354 insertions(+), 363 deletions(-) create mode 100644 usrp/host/include/Makefile.am create mode 100644 usrp/host/include/usrp/Makefile.am rename usrp/host/{lib/legacy => include/usrp}/db_base.h (100%) rename usrp/host/{lib/legacy => include/usrp}/db_base.i (99%) rename usrp/host/{lib/legacy => include/usrp}/db_basic.h (96%) rename usrp/host/{lib/legacy => include/usrp}/db_dbs_rx.h (96%) rename usrp/host/{lib/legacy => include/usrp}/db_dtt754.h (94%) rename usrp/host/{lib/legacy => include/usrp}/db_dtt768.h (94%) rename usrp/host/{lib/legacy => include/usrp}/db_flexrf.h (99%) rename usrp/host/{lib/legacy => include/usrp}/db_flexrf_mimo.h (97%) rename usrp/host/{lib/legacy => include/usrp}/db_tv_rx.h (94%) rename usrp/host/{lib/legacy => include/usrp}/db_xcvr2450.h (98%) rename usrp/host/{lib/legacy => include/usrp}/usrp_basic.h (99%) rename usrp/host/{lib/legacy => include/usrp}/usrp_bytesex.h (100%) rename usrp/host/{lib/legacy => include/usrp}/usrp_local_sighandler.h (100%) rename usrp/host/{lib/legacy => include/usrp}/usrp_prims.h (99%) rename usrp/host/{lib/legacy => include/usrp}/usrp_slots.h (100%) rename usrp/host/{lib/legacy => include/usrp}/usrp_standard.h (99%) rename usrp/host/{lib/legacy => include/usrp}/usrp_subdev_spec.h (100%) rename usrp/host/{lib/legacy => include/usrp}/usrp_tune_result.h (100%) rename usrp/host/lib/{legacy => }/README_OSX (100%) rename usrp/host/lib/{legacy => }/ad9862.h (100%) rename usrp/host/lib/{legacy => }/check_data.py (100%) rename usrp/host/lib/{legacy => }/circular_buffer.h (100%) rename usrp/host/lib/{legacy => }/circular_linked_list.h (100%) rename usrp/host/lib/{legacy => }/darwin_libusb.h (100%) rename usrp/host/lib/{legacy => }/db_base.cc (98%) rename usrp/host/lib/{legacy => }/db_base_impl.h (87%) rename usrp/host/lib/{legacy => }/db_basic.cc (98%) rename usrp/host/lib/{legacy => }/db_boards.cc (96%) rename usrp/host/lib/{legacy => }/db_boards.h (94%) rename usrp/host/lib/{legacy => }/db_dbs_rx.cc (99%) rename usrp/host/lib/{legacy => }/db_dtt754.cc (99%) rename usrp/host/lib/{legacy => }/db_dtt768.cc (99%) rename usrp/host/lib/{legacy => }/db_flexrf.cc (99%) rename usrp/host/lib/{legacy => }/db_flexrf_mimo.cc (97%) rename usrp/host/lib/{legacy => }/db_tv_rx.cc (99%) rename usrp/host/lib/{legacy => }/db_util.cc (100%) rename usrp/host/lib/{legacy => }/db_util.h (100%) rename usrp/host/lib/{legacy => }/db_xcvr2450.cc (99%) rename usrp/host/lib/{legacy => }/dump_data.py (100%) rename usrp/host/lib/{legacy => }/fusb.cc (100%) rename usrp/host/lib/{legacy => }/fusb.h (100%) rename usrp/host/lib/{legacy => }/fusb_darwin.cc (100%) rename usrp/host/lib/{legacy => }/fusb_darwin.h (100%) rename usrp/host/lib/{legacy => }/fusb_generic.cc (100%) rename usrp/host/lib/{legacy => }/fusb_generic.h (100%) rename usrp/host/lib/{legacy => }/fusb_linux.cc (100%) rename usrp/host/lib/{legacy => }/fusb_linux.h (100%) rename usrp/host/lib/{legacy => }/fusb_ra_wb.cc (100%) rename usrp/host/lib/{legacy => }/fusb_ra_wb.h (100%) rename usrp/host/lib/{legacy => }/fusb_sysconfig_darwin.cc (100%) rename usrp/host/lib/{legacy => }/fusb_sysconfig_generic.cc (100%) rename usrp/host/lib/{legacy => }/fusb_sysconfig_linux.cc (100%) rename usrp/host/lib/{legacy => }/fusb_sysconfig_ra_wb.cc (100%) rename usrp/host/lib/{legacy => }/fusb_sysconfig_win32.cc (100%) rename usrp/host/lib/{legacy => }/fusb_win32.cc (100%) rename usrp/host/lib/{legacy => }/fusb_win32.h (100%) rename usrp/host/lib/{legacy => }/gen_usrp_dbid.py (97%) delete mode 100644 usrp/host/lib/legacy/Makefile.am rename usrp/host/lib/{legacy => limbo}/db_wbx.cc (100%) rename usrp/host/lib/{legacy => limbo}/db_wbx.h (100%) rename usrp/host/lib/{legacy => }/md5.c (100%) rename usrp/host/lib/{legacy => }/md5.h (100%) rename usrp/host/lib/{legacy => }/mld_threads.h (100%) rename usrp/host/lib/{legacy => }/rate_to_regval.h (100%) rename usrp/host/lib/{legacy => }/std_paths.h.in (100%) rename usrp/host/lib/{legacy => }/usrp_basic.cc (99%) rename usrp/host/lib/{legacy => }/usrp_config.cc (100%) rename usrp/host/lib/{legacy => }/usrp_config.h (100%) rename usrp/host/lib/{legacy => }/usrp_dbid.dat (100%) rename usrp/host/lib/{legacy => }/usrp_local_sighandler.cc (97%) rename usrp/host/lib/{legacy => }/usrp_prims.cc (99%) rename usrp/host/lib/{legacy => }/usrp_standard.cc (99%) rename usrp/{host => limbo}/apps-inband/Makefile.am (100%) rename usrp/{host => limbo}/apps-inband/read_packets.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_2rx.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_2tx.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_overrun.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_ping.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_registers.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_rx.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_timestamps.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_tx.cc (100%) rename usrp/{host => limbo}/apps-inband/test_usrp_inband_underrun.cc (100%) rename usrp/{host => limbo}/apps-inband/ui_nco.h (100%) rename usrp/{host => limbo}/apps-inband/ui_sincos.c (100%) rename usrp/{host => limbo}/apps-inband/ui_sincos.h (100%) rename usrp/{host/lib => limbo}/inband/Makefile.am (100%) rename usrp/{host/lib => limbo}/inband/dump_packets.py (100%) rename usrp/{host/lib => limbo}/inband/gen_test_packets.py (100%) rename usrp/{host/lib => limbo}/inband/qa_inband.cc (100%) rename usrp/{host/lib => limbo}/inband/qa_inband.h (100%) rename usrp/{host/lib => limbo}/inband/qa_inband_packet_prims.cc (100%) rename usrp/{host/lib => limbo}/inband/qa_inband_packet_prims.h (100%) rename usrp/{host/lib => limbo}/inband/qa_inband_usrp_server.cc (100%) rename usrp/{host/lib => limbo}/inband/qa_inband_usrp_server.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_channel.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_interface_cs.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_low_level_cs.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_rx.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_rx_cs.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_server_cs.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_tx.h (100%) rename usrp/{host/lib => limbo}/inband/symbols_usrp_tx_cs.h (100%) rename usrp/{host/lib => limbo}/inband/test_inband.cc (100%) rename usrp/{host/lib => limbo}/inband/usb_packet.py (100%) rename usrp/{host/lib => limbo}/inband/usrp_inband_usb_packet.cc (100%) rename usrp/{host/lib => limbo}/inband/usrp_inband_usb_packet.h (100%) rename usrp/{host/lib => limbo}/inband/usrp_interface.mbh (100%) rename usrp/{host/lib => limbo}/inband/usrp_rx.cc (100%) rename usrp/{host/lib => limbo}/inband/usrp_rx.h (100%) rename usrp/{host/lib => limbo}/inband/usrp_rx_stub.cc (100%) rename usrp/{host/lib => limbo}/inband/usrp_rx_stub.h (100%) rename usrp/{host/lib => limbo}/inband/usrp_server.cc (100%) rename usrp/{host/lib => limbo}/inband/usrp_server.h (100%) rename usrp/{host/lib => limbo}/inband/usrp_server.mbh (100%) rename usrp/{host/lib => limbo}/inband/usrp_tx.cc (100%) rename usrp/{host/lib => limbo}/inband/usrp_tx.h (100%) rename usrp/{host/lib => limbo}/inband/usrp_tx_stub.cc (100%) rename usrp/{host/lib => limbo}/inband/usrp_tx_stub.h (100%) rename usrp/{host/lib => limbo}/inband/usrp_usb_interface.cc (100%) rename usrp/{host/lib => limbo}/inband/usrp_usb_interface.h (100%) delete mode 100644 usrp/usrp-inband.pc.in diff --git a/Makefile.common b/Makefile.common index c0625c7c..14cbe269 100644 --- a/Makefile.common +++ b/Makefile.common @@ -81,10 +81,6 @@ GRUEL_LA = @gruel_LA@ 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@ diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4 index 3b8bb28f..14c64608 100644 --- a/config/grc_usrp.m4 +++ b/config/grc_usrp.m4 @@ -20,12 +20,10 @@ dnl Boston, MA 02110-1301, USA. 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_DEFUN([GRC_USRP],[ 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.])]) @@ -57,20 +52,14 @@ AC_DEFUN([GRC_USRP],[ fi if test $passed != with; then dnl how and where to find INCLUDES and LA - usrp_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/legacy \ - -I\${abs_top_srcdir}/usrp/firmware/include \ - -I\${abs_top_builddir}/usrp/host/lib/legacy" - 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" + usrp_INCLUDES=" \ + -I\${abs_top_srcdir}/usrp/host/include \ + -I\${abs_top_builddir}/usrp/host/include \ + -I\${abs_top_srcdir}/usrp/firmware/include" + usrp_LA="\${abs_top_builddir}/usrp/host/lib/libusrp.la" fi - 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*) @@ -85,20 +74,18 @@ AC_DEFUN([GRC_USRP],[ AC_CONFIG_FILES([ \ usrp/Makefile \ usrp/usrp.pc \ - usrp/usrp-inband.pc \ usrp/usrp.iss \ usrp/doc/Doxyfile \ usrp/doc/Makefile \ usrp/doc/other/Makefile \ usrp/host/Makefile \ + usrp/host/include/Makefile \ + usrp/host/include/usrp/Makefile \ usrp/host/misc/Makefile \ usrp/host/lib/Makefile \ - usrp/host/lib/inband/Makefile \ - usrp/host/lib/legacy/Makefile \ - usrp/host/lib/legacy/std_paths.h \ + usrp/host/lib/std_paths.h \ usrp/host/swig/Makefile \ usrp/host/apps/Makefile \ - usrp/host/apps-inband/Makefile \ usrp/firmware/Makefile \ usrp/firmware/include/Makefile \ usrp/firmware/lib/Makefile \ diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc index c1a2b7c7..b8375edc 100644 --- a/gnuradio-core/src/lib/io/gri_wavfile.cc +++ b/gnuradio-core/src/lib/io/gri_wavfile.cc @@ -32,8 +32,7 @@ // WAV files are always little-endian, so we need some byte switching macros -// FIXME: These need to be refactored into a separate endianess header file -// as they duplicate routines defined in usrp/host/lib/legacy/usrp_bytesex.h +// FIXME: Use libgruel versions #ifdef WORDS_BIGENDIAN diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am index 824a4897..92938061 100644 --- a/gr-usrp/apps/Makefile.am +++ b/gr-usrp/apps/Makefile.am @@ -24,9 +24,7 @@ include $(top_srcdir)/Makefile.common # For compiling within the GNU Radio build tree AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \ -I$(top_srcdir)/gr-usrp/src \ - -I$(top_srcdir)/usrp/host/lib/legacy \ - -I\${abs_top_builddir}/usrp/host/lib/legacy \ - -I$(top_srcdir)/usrp/firmware/include \ + $(USRP_INCLUDES) \ $(WITH_INCLUDES) GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la diff --git a/gr-usrp/src/usrp_base.cc b/gr-usrp/src/usrp_base.cc index a4cf64ed..1d632a56 100644 --- a/gr-usrp/src/usrp_base.cc +++ b/gr-usrp/src/usrp_base.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #include #endif #include -#include +#include class truth_table_element_t { diff --git a/gr-usrp/src/usrp_base.h b/gr-usrp/src/usrp_base.h index a914159e..7947723f 100644 --- a/gr-usrp/src/usrp_base.h +++ b/gr-usrp/src/usrp_base.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include class usrp_basic; diff --git a/gr-usrp/src/usrp_sink_base.cc b/gr-usrp/src/usrp_sink_base.cc index cb65e02c..635d9345 100644 --- a/gr-usrp/src/usrp_sink_base.cc +++ b/gr-usrp/src/usrp_sink_base.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/gr-usrp/src/usrp_sink_base.h b/gr-usrp/src/usrp_sink_base.h index b27813a4..8d573af1 100644 --- a/gr-usrp/src/usrp_sink_base.h +++ b/gr-usrp/src/usrp_sink_base.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006,2008 Free Software Foundation, Inc. + * Copyright 2004,2006,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include class usrp_standard_tx; diff --git a/gr-usrp/src/usrp_sink_c.cc b/gr-usrp/src/usrp_sink_c.cc index 363a113f..40750b47 100644 --- a/gr-usrp/src/usrp_sink_c.cc +++ b/gr-usrp/src/usrp_sink_c.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include usrp_sink_c_sptr usrp_make_sink_c (int which_board, diff --git a/gr-usrp/src/usrp_sink_s.cc b/gr-usrp/src/usrp_sink_s.cc index adbf3acb..1f51da24 100644 --- a/gr-usrp/src/usrp_sink_s.cc +++ b/gr-usrp/src/usrp_sink_s.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include usrp_sink_s_sptr usrp_make_sink_s (int which_board, diff --git a/gr-usrp/src/usrp_source_base.cc b/gr-usrp/src/usrp_source_base.cc index 99efbcdd..85bd9171 100644 --- a/gr-usrp/src/usrp_source_base.cc +++ b/gr-usrp/src/usrp_source_base.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/gr-usrp/src/usrp_source_base.h b/gr-usrp/src/usrp_source_base.h index e1d091d8..4def48e2 100644 --- a/gr-usrp/src/usrp_source_base.h +++ b/gr-usrp/src/usrp_source_base.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include class usrp_standard_rx; diff --git a/gr-usrp/src/usrp_source_c.cc b/gr-usrp/src/usrp_source_c.cc index 71ca1e0d..26d95dc1 100644 --- a/gr-usrp/src/usrp_source_c.cc +++ b/gr-usrp/src/usrp_source_c.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include static const int NBASIC_SAMPLES_PER_ITEM = 2; // I & Q diff --git a/gr-usrp/src/usrp_source_s.cc b/gr-usrp/src/usrp_source_s.cc index f2038459..88b8495d 100644 --- a/gr-usrp/src/usrp_source_s.cc +++ b/gr-usrp/src/usrp_source_s.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include static const int NBASIC_SAMPLES_PER_ITEM = 1; diff --git a/gr-usrp/src/usrp_standard.i b/gr-usrp/src/usrp_standard.i index 7d32cdf8..61053bb3 100644 --- a/gr-usrp/src/usrp_standard.i +++ b/gr-usrp/src/usrp_standard.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,13 +23,13 @@ // FIXME: move to usrp/usrpm component %{ -#include +#include #include -#include +#include %} %include -%include +%include %constant int FPGA_MODE_NORMAL = usrp_standard_rx::FPGA_MODE_NORMAL; %constant int FPGA_MODE_LOOPBACK = usrp_standard_rx::FPGA_MODE_LOOPBACK; diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i index f5841985..2a47877c 100644 --- a/gr-usrp/src/usrp_swig.i +++ b/gr-usrp/src/usrp_swig.i @@ -26,8 +26,8 @@ #include %} -%include -%include +%include +%include %include %include %include "usrp_standard.i" diff --git a/usrp/Makefile.am b/usrp/Makefile.am index 6f5abbd5..c3e529da 100644 --- a/usrp/Makefile.am +++ b/usrp/Makefile.am @@ -21,7 +21,6 @@ EXTRA_DIST = \ usrp.pc.in \ - usrp-inband.pc.in \ usrp.iss.in \ usrp.inf @@ -29,6 +28,4 @@ SUBDIRS = host firmware fpga doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ - usrp.pc \ - usrp-inband.pc - + usrp.pc diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am index 97ca60bf..e17726c0 100644 --- a/usrp/firmware/include/Makefile.am +++ b/usrp/firmware/include/Makefile.am @@ -19,7 +19,9 @@ # Boston, MA 02110-1301, USA. # -include_HEADERS = \ +usrpincludedir = $(includedir)/usrp + +usrpinclude_HEADERS = \ usrp_i2c_addr.h \ usrp_spi_defs.h \ fpga_regs_common.h \ diff --git a/usrp/host/Makefile.am b/usrp/host/Makefile.am index 514b835a..aa94fbd6 100644 --- a/usrp/host/Makefile.am +++ b/usrp/host/Makefile.am @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = misc lib apps apps-inband +SUBDIRS = misc lib include apps if PYTHON SUBDIRS += swig diff --git a/usrp/host/apps/test_usrp_standard_rx.cc b/usrp/host/apps/test_usrp_standard_rx.cc index 4a47daa9..f6897ed2 100644 --- a/usrp/host/apps/test_usrp_standard_rx.cc +++ b/usrp/host/apps/test_usrp_standard_rx.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2003,2006,2008 Free Software Foundation, Inc. + * Copyright 2003,2006,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -33,8 +33,8 @@ #include #include #include "time_stuff.h" -#include "usrp_standard.h" -#include "usrp_bytesex.h" +#include +#include #include "fpga_regs_common.h" #include "fpga_regs_standard.h" diff --git a/usrp/host/apps/test_usrp_standard_tx.cc b/usrp/host/apps/test_usrp_standard_tx.cc index 3cc20c44..3f881737 100644 --- a/usrp/host/apps/test_usrp_standard_tx.cc +++ b/usrp/host/apps/test_usrp_standard_tx.cc @@ -34,8 +34,8 @@ #include #include #include "time_stuff.h" -#include "usrp_standard.h" -#include "usrp_bytesex.h" +#include +#include #include enum { diff --git a/usrp/host/apps/usrp_cal_dc_offset.cc b/usrp/host/apps/usrp_cal_dc_offset.cc index 5ebac12a..22d427df 100644 --- a/usrp/host/apps/usrp_cal_dc_offset.cc +++ b/usrp/host/apps/usrp_cal_dc_offset.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005,2008 Free Software Foundation, Inc. + * Copyright 2005,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -33,9 +33,9 @@ #include #include #include -#include "usrp_local_sighandler.h" -#include "usrp_standard.h" -#include "usrp_bytesex.h" +#include +#include +#include char *prog_name; diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc index 3740022e..fe8ff90d 100644 --- a/usrp/host/apps/usrper.cc +++ b/usrp/host/apps/usrper.cc @@ -2,7 +2,7 @@ /* * USRP - Universal Software Radio Peripheral * - * Copyright (C) 2003,2004 Free Software Foundation, Inc. + * Copyright (C) 2003,2004,2009 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ #include #include -#include "usrp_prims.h" +#include "usrp/usrp_prims.h" #include "usrp_spi_defs.h" #include diff --git a/usrp/host/include/Makefile.am b/usrp/host/include/Makefile.am new file mode 100644 index 00000000..5de5fe58 --- /dev/null +++ b/usrp/host/include/Makefile.am @@ -0,0 +1,23 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +SUBDIRS = usrp + diff --git a/usrp/host/include/usrp/Makefile.am b/usrp/host/include/usrp/Makefile.am new file mode 100644 index 00000000..91d43923 --- /dev/null +++ b/usrp/host/include/usrp/Makefile.am @@ -0,0 +1,49 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +usrpincludedir = $(includedir)/usrp + +usrpinclude_HEADERS = \ + db_base.h \ + db_basic.h \ + db_dbs_rx.h \ + db_dtt754.h \ + db_dtt768.h \ + db_flexrf.h \ + db_flexrf_mimo.h \ + db_tv_rx.h \ + db_xcvr2450.h \ + usrp_basic.h \ + usrp_bytesex.h \ + usrp_dbid.h \ + usrp_local_sighandler.h \ + usrp_prims.h \ + usrp_slots.h \ + usrp_standard.h \ + usrp_subdev_spec.h \ + usrp_tune_result.h + +if PYTHON +swiginclude_HEADERS = \ + db_base.i +endif diff --git a/usrp/host/lib/legacy/db_base.h b/usrp/host/include/usrp/db_base.h similarity index 100% rename from usrp/host/lib/legacy/db_base.h rename to usrp/host/include/usrp/db_base.h diff --git a/usrp/host/lib/legacy/db_base.i b/usrp/host/include/usrp/db_base.i similarity index 99% rename from usrp/host/lib/legacy/db_base.i rename to usrp/host/include/usrp/db_base.i index bd5483aa..78c72b8c 100644 --- a/usrp/host/lib/legacy/db_base.i +++ b/usrp/host/include/usrp/db_base.i @@ -22,7 +22,7 @@ %{ -#include "db_base.h" +#include %} %include diff --git a/usrp/host/lib/legacy/db_basic.h b/usrp/host/include/usrp/db_basic.h similarity index 96% rename from usrp/host/lib/legacy/db_basic.h rename to usrp/host/include/usrp/db_basic.h index 4dd92b99..7f81733f 100644 --- a/usrp/host/lib/legacy/db_basic.h +++ b/usrp/host/include/usrp/db_basic.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -22,7 +22,7 @@ #ifndef DB_BASIC_H #define DB_BASIC_H -#include +#include /******************************************************************************/ diff --git a/usrp/host/lib/legacy/db_dbs_rx.h b/usrp/host/include/usrp/db_dbs_rx.h similarity index 96% rename from usrp/host/lib/legacy/db_dbs_rx.h rename to usrp/host/include/usrp/db_dbs_rx.h index 723771f1..7f869637 100644 --- a/usrp/host/lib/legacy/db_dbs_rx.h +++ b/usrp/host/include/usrp/db_dbs_rx.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -22,7 +22,7 @@ #ifndef DB_DBS_RX_H #define DB_DBS_RX_H -#include +#include #include #if 0 diff --git a/usrp/host/lib/legacy/db_dtt754.h b/usrp/host/include/usrp/db_dtt754.h similarity index 94% rename from usrp/host/lib/legacy/db_dtt754.h rename to usrp/host/include/usrp/db_dtt754.h index 0c104ac0..4fb95282 100644 --- a/usrp/host/lib/legacy/db_dtt754.h +++ b/usrp/host/include/usrp/db_dtt754.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -22,7 +22,7 @@ #ifndef DB_DTT754_H #define DB_DTT754_H -#include +#include #include class db_dtt754 : public db_base diff --git a/usrp/host/lib/legacy/db_dtt768.h b/usrp/host/include/usrp/db_dtt768.h similarity index 94% rename from usrp/host/lib/legacy/db_dtt768.h rename to usrp/host/include/usrp/db_dtt768.h index dd5a59ab..78e157e7 100644 --- a/usrp/host/lib/legacy/db_dtt768.h +++ b/usrp/host/include/usrp/db_dtt768.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -22,7 +22,7 @@ #ifndef DB_DTT768_H #define DB_DTT768_H -#include +#include #include class db_dtt768 : public db_base diff --git a/usrp/host/lib/legacy/db_flexrf.h b/usrp/host/include/usrp/db_flexrf.h similarity index 99% rename from usrp/host/lib/legacy/db_flexrf.h rename to usrp/host/include/usrp/db_flexrf.h index b9ccfc3a..3adad302 100644 --- a/usrp/host/lib/legacy/db_flexrf.h +++ b/usrp/host/include/usrp/db_flexrf.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -22,7 +22,7 @@ #ifndef DB_FLEXRF_H #define DB_FLEXRF_H -#include +#include #include //debug_using_gui = true // Must be set to True or False diff --git a/usrp/host/lib/legacy/db_flexrf_mimo.h b/usrp/host/include/usrp/db_flexrf_mimo.h similarity index 97% rename from usrp/host/lib/legacy/db_flexrf_mimo.h rename to usrp/host/include/usrp/db_flexrf_mimo.h index aeff5325..771f3b27 100644 --- a/usrp/host/lib/legacy/db_flexrf_mimo.h +++ b/usrp/host/include/usrp/db_flexrf_mimo.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include class db_flexrf_2400_tx_mimo_a : public db_flexrf_2400_tx { diff --git a/usrp/host/lib/legacy/db_tv_rx.h b/usrp/host/include/usrp/db_tv_rx.h similarity index 94% rename from usrp/host/lib/legacy/db_tv_rx.h rename to usrp/host/include/usrp/db_tv_rx.h index ed916263..ee3ed2bf 100644 --- a/usrp/host/lib/legacy/db_tv_rx.h +++ b/usrp/host/include/usrp/db_tv_rx.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -22,7 +22,7 @@ #ifndef DB_TV_RX_H #define DB_TV_RX_H -#include +#include class db_tv_rx : public db_base { diff --git a/usrp/host/lib/legacy/db_xcvr2450.h b/usrp/host/include/usrp/db_xcvr2450.h similarity index 98% rename from usrp/host/lib/legacy/db_xcvr2450.h rename to usrp/host/include/usrp/db_xcvr2450.h index 1f9dd7c2..305c60d0 100644 --- a/usrp/host/lib/legacy/db_xcvr2450.h +++ b/usrp/host/include/usrp/db_xcvr2450.h @@ -22,7 +22,7 @@ #ifndef DB_XCVR2450_H #define DB_XCVR2450_H -#include +#include #include class xcvr2450; diff --git a/usrp/host/lib/legacy/usrp_basic.h b/usrp/host/include/usrp/usrp_basic.h similarity index 99% rename from usrp/host/lib/legacy/usrp_basic.h rename to usrp/host/include/usrp/usrp_basic.h index 86c48635..fbbf49d5 100644 --- a/usrp/host/lib/legacy/usrp_basic.h +++ b/usrp/host/include/usrp/usrp_basic.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2003,2004,2008 Free Software Foundation, Inc. + * Copyright 2003,2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -39,12 +39,12 @@ #ifndef INCLUDED_USRP_BASIC_H #define INCLUDED_USRP_BASIC_H -#include -#include +#include +#include #include #include #include -#include +#include struct usb_dev_handle; class fusb_devhandle; diff --git a/usrp/host/lib/legacy/usrp_bytesex.h b/usrp/host/include/usrp/usrp_bytesex.h similarity index 100% rename from usrp/host/lib/legacy/usrp_bytesex.h rename to usrp/host/include/usrp/usrp_bytesex.h diff --git a/usrp/host/lib/legacy/usrp_local_sighandler.h b/usrp/host/include/usrp/usrp_local_sighandler.h similarity index 100% rename from usrp/host/lib/legacy/usrp_local_sighandler.h rename to usrp/host/include/usrp/usrp_local_sighandler.h diff --git a/usrp/host/lib/legacy/usrp_prims.h b/usrp/host/include/usrp/usrp_prims.h similarity index 99% rename from usrp/host/lib/legacy/usrp_prims.h rename to usrp/host/include/usrp/usrp_prims.h index aa134742..aa088705 100644 --- a/usrp/host/lib/legacy/usrp_prims.h +++ b/usrp/host/include/usrp/usrp_prims.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2003,2004,2006 Free Software Foundation, Inc. + * Copyright 2003,2004,2006,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -34,7 +34,7 @@ #ifndef _USRP_PRIMS_H_ #define _USRP_PRIMS_H_ -#include +#include #include static const int USRP_HASH_SIZE = 16; diff --git a/usrp/host/lib/legacy/usrp_slots.h b/usrp/host/include/usrp/usrp_slots.h similarity index 100% rename from usrp/host/lib/legacy/usrp_slots.h rename to usrp/host/include/usrp/usrp_slots.h diff --git a/usrp/host/lib/legacy/usrp_standard.h b/usrp/host/include/usrp/usrp_standard.h similarity index 99% rename from usrp/host/lib/legacy/usrp_standard.h rename to usrp/host/include/usrp/usrp_standard.h index 734fff4b..a631f8b0 100644 --- a/usrp/host/lib/legacy/usrp_standard.h +++ b/usrp/host/include/usrp/usrp_standard.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,9 +23,9 @@ #ifndef INCLUDED_USRP_STANDARD_H #define INCLUDED_USRP_STANDARD_H -#include +#include #include -#include +#include class usrp_standard_tx; class usrp_standard_rx; diff --git a/usrp/host/lib/legacy/usrp_subdev_spec.h b/usrp/host/include/usrp/usrp_subdev_spec.h similarity index 100% rename from usrp/host/lib/legacy/usrp_subdev_spec.h rename to usrp/host/include/usrp/usrp_subdev_spec.h diff --git a/usrp/host/lib/legacy/usrp_tune_result.h b/usrp/host/include/usrp/usrp_tune_result.h similarity index 100% rename from usrp/host/lib/legacy/usrp_tune_result.h rename to usrp/host/include/usrp/usrp_tune_result.h diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index 2062bda6..8482485f 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -1,7 +1,7 @@ # # USRP - Universal Software Radio Peripheral # -# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc. +# Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,5 +20,154 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = legacy inband +common_INCLUDES = $(USRP_INCLUDES) +lib_LTLIBRARIES = libusrp.la + +libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS) + +libusrp_la_common_LIBADD = \ + $(USB_LIBS) \ + $(BOOST_THREAD_LIB) \ + ../misc/libmisc.la + +# darwin fusb requires omnithreads +if FUSB_TECH_darwin +AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) +libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA) +libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation +else +AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) +libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) +libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) +endif + +EXTRA_DIST = \ + std_paths.h.in \ + usrp_dbid.dat + +BUILT_SOURCES = \ + $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h + +BUILT_SOURCES += usrp_dbid.cc \ + usrp_dbid.py + +# ---------------------------------------------------------------- +# FUSB_TECH is set at configure time by way of +# usrp/config/usrp_fusb_tech.m4. +# It indicates which fast usb strategy we should be building. +# We currently implement "generic", "darwin", "win32" and "linux" + + +generic_CODE = \ + fusb_generic.cc \ + fusb_sysconfig_generic.cc + +darwin_CODE = \ + fusb_darwin.cc \ + fusb_sysconfig_darwin.cc \ + README_OSX \ + circular_buffer.h \ + circular_linked_list.h \ + darwin_libusb.h \ + mld_threads.h + +win32_CODE = \ + fusb_win32.cc \ + fusb_sysconfig_win32.cc + +linux_CODE = \ + fusb_linux.cc \ + fusb_sysconfig_linux.cc + +ra_wb_CODE = \ + fusb_ra_wb.cc \ + fusb_sysconfig_ra_wb.cc + + +# +# include each _CODE entry here... +# +EXTRA_libusrp_la_SOURCES = \ + $(generic_CODE) \ + $(darwin_CODE) \ + $(win32_CODE) \ + $(linux_CODE) \ + $(ra_wb_CODE) + + +# work around automake deficiency +libusrp_la_common_SOURCES = \ + fusb.cc \ + md5.c \ + usrp_basic.cc \ + usrp_config.cc \ + usrp_dbid.cc \ + usrp_local_sighandler.cc \ + usrp_prims.cc \ + usrp_standard.cc \ + db_boards.cc \ + db_base.cc \ + db_basic.cc \ + db_tv_rx.cc \ + db_flexrf.cc \ + db_flexrf_mimo.cc \ + db_dbs_rx.cc \ + db_xcvr2450.cc \ + db_dtt754.cc \ + db_dtt768.cc \ + db_util.cc + + + +if FUSB_TECH_generic +libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE) +endif + +if FUSB_TECH_darwin +libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE) +endif + +if FUSB_TECH_win32 +libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE) +endif + +if FUSB_TECH_linux +libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE) +endif + +if FUSB_TECH_ra_wb +libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE) +endif + +noinst_HEADERS = \ + ad9862.h \ + db_base_impl.h \ + db_boards.h \ + db_util.h \ + fusb.h \ + fusb_darwin.h \ + fusb_generic.h \ + fusb_linux.h \ + fusb_ra_wb.h \ + fusb_win32.h \ + md5.h \ + rate_to_regval.h \ + usrp_config.h + +if PYTHON +usrppython_PYTHON = \ + usrp_dbid.py + +noinst_PYTHON = \ + gen_usrp_dbid.py \ + check_data.py \ + dump_data.py +endif + +# common way for generating sources from templates when using +# BUILT_SOURCES, using parallel build protection. +gen_sources = $(BUILT_SOURCES) +gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat +par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat +include $(top_srcdir)/Makefile.par.gen diff --git a/usrp/host/lib/legacy/README_OSX b/usrp/host/lib/README_OSX similarity index 100% rename from usrp/host/lib/legacy/README_OSX rename to usrp/host/lib/README_OSX diff --git a/usrp/host/lib/legacy/ad9862.h b/usrp/host/lib/ad9862.h similarity index 100% rename from usrp/host/lib/legacy/ad9862.h rename to usrp/host/lib/ad9862.h diff --git a/usrp/host/lib/legacy/check_data.py b/usrp/host/lib/check_data.py similarity index 100% rename from usrp/host/lib/legacy/check_data.py rename to usrp/host/lib/check_data.py diff --git a/usrp/host/lib/legacy/circular_buffer.h b/usrp/host/lib/circular_buffer.h similarity index 100% rename from usrp/host/lib/legacy/circular_buffer.h rename to usrp/host/lib/circular_buffer.h diff --git a/usrp/host/lib/legacy/circular_linked_list.h b/usrp/host/lib/circular_linked_list.h similarity index 100% rename from usrp/host/lib/legacy/circular_linked_list.h rename to usrp/host/lib/circular_linked_list.h diff --git a/usrp/host/lib/legacy/darwin_libusb.h b/usrp/host/lib/darwin_libusb.h similarity index 100% rename from usrp/host/lib/legacy/darwin_libusb.h rename to usrp/host/lib/darwin_libusb.h diff --git a/usrp/host/lib/legacy/db_base.cc b/usrp/host/lib/db_base.cc similarity index 98% rename from usrp/host/lib/legacy/db_base.cc rename to usrp/host/lib/db_base.cc index 80c6d466..102166a8 100644 --- a/usrp/host/lib/legacy/db_base.cc +++ b/usrp/host/lib/db_base.cc @@ -1,5 +1,5 @@ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -19,7 +19,7 @@ // Boston, MA 02110-1301, USA. // -#include +#include #include #if 0 diff --git a/usrp/host/lib/legacy/db_base_impl.h b/usrp/host/lib/db_base_impl.h similarity index 87% rename from usrp/host/lib/legacy/db_base_impl.h rename to usrp/host/lib/db_base_impl.h index bb4d95d7..9d5ca437 100644 --- a/usrp/host/lib/legacy/db_base_impl.h +++ b/usrp/host/lib/db_base_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,12 +21,12 @@ #ifndef INCLUDED_DB_BASE_IMPL_H #define INCLUDED_DB_BASE_IMPL_H -#include +#include #include -#include +#include #include #include -#include +#include #include #include diff --git a/usrp/host/lib/legacy/db_basic.cc b/usrp/host/lib/db_basic.cc similarity index 98% rename from usrp/host/lib/legacy/db_basic.cc rename to usrp/host/lib/db_basic.cc index 4bafc939..0c6bedec 100644 --- a/usrp/host/lib/legacy/db_basic.cc +++ b/usrp/host/lib/db_basic.cc @@ -1,5 +1,5 @@ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -18,10 +18,9 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. -#include +#include #include - db_basic_tx::db_basic_tx(boost::shared_ptr usrp, int which) : db_base(usrp, which) { diff --git a/usrp/host/lib/legacy/db_boards.cc b/usrp/host/lib/db_boards.cc similarity index 96% rename from usrp/host/lib/legacy/db_boards.cc rename to usrp/host/lib/db_boards.cc index b537698b..070b8dd4 100644 --- a/usrp/host/lib/legacy/db_boards.cc +++ b/usrp/host/lib/db_boards.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -21,16 +21,15 @@ // #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include std::vector diff --git a/usrp/host/lib/legacy/db_boards.h b/usrp/host/lib/db_boards.h similarity index 94% rename from usrp/host/lib/legacy/db_boards.h rename to usrp/host/lib/db_boards.h index 037c4603..136091c5 100644 --- a/usrp/host/lib/legacy/db_boards.h +++ b/usrp/host/lib/db_boards.h @@ -23,8 +23,8 @@ #ifndef DB_BOARDS_H #define DB_BOARDS_H -#include -#include +#include +#include std::vector instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side); diff --git a/usrp/host/lib/legacy/db_dbs_rx.cc b/usrp/host/lib/db_dbs_rx.cc similarity index 99% rename from usrp/host/lib/legacy/db_dbs_rx.cc rename to usrp/host/lib/db_dbs_rx.cc index 6094f913..99f66c78 100644 --- a/usrp/host/lib/legacy/db_dbs_rx.cc +++ b/usrp/host/lib/db_dbs_rx.cc @@ -18,7 +18,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. -#include +#include #include #include #include diff --git a/usrp/host/lib/legacy/db_dtt754.cc b/usrp/host/lib/db_dtt754.cc similarity index 99% rename from usrp/host/lib/legacy/db_dtt754.cc rename to usrp/host/lib/db_dtt754.cc index 4a6a1a29..d78c5b32 100644 --- a/usrp/host/lib/legacy/db_dtt754.cc +++ b/usrp/host/lib/db_dtt754.cc @@ -19,7 +19,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. -#include +#include #include int diff --git a/usrp/host/lib/legacy/db_dtt768.cc b/usrp/host/lib/db_dtt768.cc similarity index 99% rename from usrp/host/lib/legacy/db_dtt768.cc rename to usrp/host/lib/db_dtt768.cc index cae8b734..a520fdc6 100644 --- a/usrp/host/lib/legacy/db_dtt768.cc +++ b/usrp/host/lib/db_dtt768.cc @@ -19,7 +19,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. -#include +#include #include int diff --git a/usrp/host/lib/legacy/db_flexrf.cc b/usrp/host/lib/db_flexrf.cc similarity index 99% rename from usrp/host/lib/legacy/db_flexrf.cc rename to usrp/host/lib/db_flexrf.cc index 662d9095..a8f4684b 100644 --- a/usrp/host/lib/legacy/db_flexrf.cc +++ b/usrp/host/lib/db_flexrf.cc @@ -18,7 +18,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. -#include +#include #include // d'board i/o pin defs diff --git a/usrp/host/lib/legacy/db_flexrf_mimo.cc b/usrp/host/lib/db_flexrf_mimo.cc similarity index 97% rename from usrp/host/lib/legacy/db_flexrf_mimo.cc rename to usrp/host/lib/db_flexrf_mimo.cc index fd996bfa..e2db5cd1 100644 --- a/usrp/host/lib/legacy/db_flexrf_mimo.cc +++ b/usrp/host/lib/db_flexrf_mimo.cc @@ -1,5 +1,5 @@ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -19,10 +19,10 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include -#include +#include #include diff --git a/usrp/host/lib/legacy/db_tv_rx.cc b/usrp/host/lib/db_tv_rx.cc similarity index 99% rename from usrp/host/lib/legacy/db_tv_rx.cc rename to usrp/host/lib/db_tv_rx.cc index 803ebf86..494ee7a1 100644 --- a/usrp/host/lib/legacy/db_tv_rx.cc +++ b/usrp/host/lib/db_tv_rx.cc @@ -18,7 +18,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. -#include +#include #include /*****************************************************************************/ diff --git a/usrp/host/lib/legacy/db_util.cc b/usrp/host/lib/db_util.cc similarity index 100% rename from usrp/host/lib/legacy/db_util.cc rename to usrp/host/lib/db_util.cc diff --git a/usrp/host/lib/legacy/db_util.h b/usrp/host/lib/db_util.h similarity index 100% rename from usrp/host/lib/legacy/db_util.h rename to usrp/host/lib/db_util.h diff --git a/usrp/host/lib/legacy/db_xcvr2450.cc b/usrp/host/lib/db_xcvr2450.cc similarity index 99% rename from usrp/host/lib/legacy/db_xcvr2450.cc rename to usrp/host/lib/db_xcvr2450.cc index 9ce3168e..408a0558 100644 --- a/usrp/host/lib/legacy/db_xcvr2450.cc +++ b/usrp/host/lib/db_xcvr2450.cc @@ -18,7 +18,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. -#include +#include #include #include #include diff --git a/usrp/host/lib/legacy/dump_data.py b/usrp/host/lib/dump_data.py similarity index 100% rename from usrp/host/lib/legacy/dump_data.py rename to usrp/host/lib/dump_data.py diff --git a/usrp/host/lib/legacy/fusb.cc b/usrp/host/lib/fusb.cc similarity index 100% rename from usrp/host/lib/legacy/fusb.cc rename to usrp/host/lib/fusb.cc diff --git a/usrp/host/lib/legacy/fusb.h b/usrp/host/lib/fusb.h similarity index 100% rename from usrp/host/lib/legacy/fusb.h rename to usrp/host/lib/fusb.h diff --git a/usrp/host/lib/legacy/fusb_darwin.cc b/usrp/host/lib/fusb_darwin.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_darwin.cc rename to usrp/host/lib/fusb_darwin.cc diff --git a/usrp/host/lib/legacy/fusb_darwin.h b/usrp/host/lib/fusb_darwin.h similarity index 100% rename from usrp/host/lib/legacy/fusb_darwin.h rename to usrp/host/lib/fusb_darwin.h diff --git a/usrp/host/lib/legacy/fusb_generic.cc b/usrp/host/lib/fusb_generic.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_generic.cc rename to usrp/host/lib/fusb_generic.cc diff --git a/usrp/host/lib/legacy/fusb_generic.h b/usrp/host/lib/fusb_generic.h similarity index 100% rename from usrp/host/lib/legacy/fusb_generic.h rename to usrp/host/lib/fusb_generic.h diff --git a/usrp/host/lib/legacy/fusb_linux.cc b/usrp/host/lib/fusb_linux.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_linux.cc rename to usrp/host/lib/fusb_linux.cc diff --git a/usrp/host/lib/legacy/fusb_linux.h b/usrp/host/lib/fusb_linux.h similarity index 100% rename from usrp/host/lib/legacy/fusb_linux.h rename to usrp/host/lib/fusb_linux.h diff --git a/usrp/host/lib/legacy/fusb_ra_wb.cc b/usrp/host/lib/fusb_ra_wb.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_ra_wb.cc rename to usrp/host/lib/fusb_ra_wb.cc diff --git a/usrp/host/lib/legacy/fusb_ra_wb.h b/usrp/host/lib/fusb_ra_wb.h similarity index 100% rename from usrp/host/lib/legacy/fusb_ra_wb.h rename to usrp/host/lib/fusb_ra_wb.h diff --git a/usrp/host/lib/legacy/fusb_sysconfig_darwin.cc b/usrp/host/lib/fusb_sysconfig_darwin.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_sysconfig_darwin.cc rename to usrp/host/lib/fusb_sysconfig_darwin.cc diff --git a/usrp/host/lib/legacy/fusb_sysconfig_generic.cc b/usrp/host/lib/fusb_sysconfig_generic.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_sysconfig_generic.cc rename to usrp/host/lib/fusb_sysconfig_generic.cc diff --git a/usrp/host/lib/legacy/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_sysconfig_linux.cc rename to usrp/host/lib/fusb_sysconfig_linux.cc diff --git a/usrp/host/lib/legacy/fusb_sysconfig_ra_wb.cc b/usrp/host/lib/fusb_sysconfig_ra_wb.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_sysconfig_ra_wb.cc rename to usrp/host/lib/fusb_sysconfig_ra_wb.cc diff --git a/usrp/host/lib/legacy/fusb_sysconfig_win32.cc b/usrp/host/lib/fusb_sysconfig_win32.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_sysconfig_win32.cc rename to usrp/host/lib/fusb_sysconfig_win32.cc diff --git a/usrp/host/lib/legacy/fusb_win32.cc b/usrp/host/lib/fusb_win32.cc similarity index 100% rename from usrp/host/lib/legacy/fusb_win32.cc rename to usrp/host/lib/fusb_win32.cc diff --git a/usrp/host/lib/legacy/fusb_win32.h b/usrp/host/lib/fusb_win32.h similarity index 100% rename from usrp/host/lib/legacy/fusb_win32.h rename to usrp/host/lib/fusb_win32.h diff --git a/usrp/host/lib/legacy/gen_usrp_dbid.py b/usrp/host/lib/gen_usrp_dbid.py similarity index 97% rename from usrp/host/lib/legacy/gen_usrp_dbid.py rename to usrp/host/lib/gen_usrp_dbid.py index bbfdc750..c7d3770c 100755 --- a/usrp/host/lib/legacy/gen_usrp_dbid.py +++ b/usrp/host/lib/gen_usrp_dbid.py @@ -25,7 +25,7 @@ def gen_dbid_py(r): f.write('%-16s = %s\n' % (x[1], x[2])) def gen_dbid_h(r): - f = open('usrp_dbid.h', 'w') + f = open('../include/usrp/usrp_dbid.h', 'w') comment_char = '//' write_header(f, comment_char) f.write(comment_char); f.write('\n') @@ -64,8 +64,8 @@ def gen_dbid_cc(r): * Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #define NELEM(x) sizeof(x)/sizeof(x[0]) diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am deleted file mode 100644 index e1b1b850..00000000 --- a/usrp/host/lib/legacy/Makefile.am +++ /dev/null @@ -1,196 +0,0 @@ -# -# USRP - Universal Software Radio Peripheral -# -# Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301 USA -# - -include $(top_srcdir)/Makefile.common - -common_INCLUDES = $(USRP_INCLUDES) - -lib_LTLIBRARIES = libusrp.la - -libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS) - -libusrp_la_common_LIBADD = \ - $(USB_LIBS) \ - $(BOOST_THREAD_LIB) \ - ../../misc/libmisc.la - -# darwin fusb requires omnithreads -if FUSB_TECH_darwin -AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) -libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA) -libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation -else -AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) -libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) -libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -endif - -EXTRA_DIST = \ - std_paths.h.in \ - usrp_dbid.dat - -BUILT_SOURCES = \ - usrp_dbid.h - -BUILT_SOURCES += usrp_dbid.cc \ - usrp_dbid.py - -# ---------------------------------------------------------------- -# FUSB_TECH is set at configure time by way of -# usrp/config/usrp_fusb_tech.m4. -# It indicates which fast usb strategy we should be building. -# We currently implement "generic", "darwin", "win32" and "linux" - - -generic_CODE = \ - fusb_generic.cc \ - fusb_sysconfig_generic.cc - -darwin_CODE = \ - fusb_darwin.cc \ - fusb_sysconfig_darwin.cc \ - README_OSX \ - circular_buffer.h \ - circular_linked_list.h \ - darwin_libusb.h \ - mld_threads.h - -win32_CODE = \ - fusb_win32.cc \ - fusb_sysconfig_win32.cc - -linux_CODE = \ - fusb_linux.cc \ - fusb_sysconfig_linux.cc - -ra_wb_CODE = \ - fusb_ra_wb.cc \ - fusb_sysconfig_ra_wb.cc - - -# -# include each _CODE entry here... -# -EXTRA_libusrp_la_SOURCES = \ - $(generic_CODE) \ - $(darwin_CODE) \ - $(win32_CODE) \ - $(linux_CODE) \ - $(ra_wb_CODE) - - -# work around automake deficiency -libusrp_la_common_SOURCES = \ - fusb.cc \ - md5.c \ - usrp_basic.cc \ - usrp_config.cc \ - usrp_dbid.cc \ - usrp_local_sighandler.cc \ - usrp_prims.cc \ - usrp_standard.cc \ - db_boards.cc \ - db_base.cc \ - db_basic.cc \ - db_tv_rx.cc \ - db_flexrf.cc \ - db_flexrf_mimo.cc \ - db_dbs_rx.cc \ - db_xcvr2450.cc \ - db_dtt754.cc \ - db_dtt768.cc \ - db_util.cc - - - -if FUSB_TECH_generic -libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE) -endif - -if FUSB_TECH_darwin -libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE) -endif - -if FUSB_TECH_win32 -libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE) -endif - -if FUSB_TECH_linux -libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE) -endif - -if FUSB_TECH_ra_wb -libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE) -endif - -include_HEADERS = \ - db_base.h \ - db_basic.h \ - db_dbs_rx.h \ - db_dtt754.h \ - db_dtt768.h \ - db_flexrf.h \ - db_flexrf_mimo.h \ - db_tv_rx.h \ - db_util.h \ - db_xcvr2450.h \ - usrp_basic.h \ - usrp_bytesex.h \ - usrp_config.h \ - usrp_dbid.h \ - usrp_prims.h \ - usrp_slots.h \ - usrp_standard.h \ - usrp_subdev_spec.h \ - usrp_tune_result.h - -noinst_HEADERS = \ - ad9862.h \ - db_base_impl.h \ - db_boards.h \ - db_wbx.h \ - fusb.h \ - fusb_darwin.h \ - fusb_generic.h \ - fusb_linux.h \ - fusb_ra_wb.h \ - fusb_win32.h \ - md5.h \ - rate_to_regval.h \ - usrp_local_sighandler.h - -if PYTHON -usrppython_PYTHON = \ - usrp_dbid.py - -noinst_PYTHON = \ - gen_usrp_dbid.py \ - check_data.py \ - dump_data.py - -swiginclude_HEADERS = db_base.i -endif - -# common way for generating sources from templates when using -# BUILT_SOURCES, using parallel build protection. -gen_sources = $(BUILT_SOURCES) -gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat -par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat -include $(top_srcdir)/Makefile.par.gen diff --git a/usrp/host/lib/legacy/db_wbx.cc b/usrp/host/lib/limbo/db_wbx.cc similarity index 100% rename from usrp/host/lib/legacy/db_wbx.cc rename to usrp/host/lib/limbo/db_wbx.cc diff --git a/usrp/host/lib/legacy/db_wbx.h b/usrp/host/lib/limbo/db_wbx.h similarity index 100% rename from usrp/host/lib/legacy/db_wbx.h rename to usrp/host/lib/limbo/db_wbx.h diff --git a/usrp/host/lib/legacy/md5.c b/usrp/host/lib/md5.c similarity index 100% rename from usrp/host/lib/legacy/md5.c rename to usrp/host/lib/md5.c diff --git a/usrp/host/lib/legacy/md5.h b/usrp/host/lib/md5.h similarity index 100% rename from usrp/host/lib/legacy/md5.h rename to usrp/host/lib/md5.h diff --git a/usrp/host/lib/legacy/mld_threads.h b/usrp/host/lib/mld_threads.h similarity index 100% rename from usrp/host/lib/legacy/mld_threads.h rename to usrp/host/lib/mld_threads.h diff --git a/usrp/host/lib/legacy/rate_to_regval.h b/usrp/host/lib/rate_to_regval.h similarity index 100% rename from usrp/host/lib/legacy/rate_to_regval.h rename to usrp/host/lib/rate_to_regval.h diff --git a/usrp/host/lib/legacy/std_paths.h.in b/usrp/host/lib/std_paths.h.in similarity index 100% rename from usrp/host/lib/legacy/std_paths.h.in rename to usrp/host/lib/std_paths.h.in diff --git a/usrp/host/lib/legacy/usrp_basic.cc b/usrp/host/lib/usrp_basic.cc similarity index 99% rename from usrp/host/lib/legacy/usrp_basic.cc rename to usrp/host/lib/usrp_basic.cc index 295c62f8..4f3df521 100644 --- a/usrp/host/lib/legacy/usrp_basic.cc +++ b/usrp/host/lib/usrp_basic.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2003,2004,2008 Free Software Foundation, Inc. + * Copyright 2003,2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,8 +24,8 @@ #include "config.h" #endif -#include "usrp_basic.h" -#include "usrp_prims.h" +#include +#include "usrp/usrp_prims.h" #include "usrp_interfaces.h" #include "fpga_regs_common.h" #include "fpga_regs_standard.h" diff --git a/usrp/host/lib/legacy/usrp_config.cc b/usrp/host/lib/usrp_config.cc similarity index 100% rename from usrp/host/lib/legacy/usrp_config.cc rename to usrp/host/lib/usrp_config.cc diff --git a/usrp/host/lib/legacy/usrp_config.h b/usrp/host/lib/usrp_config.h similarity index 100% rename from usrp/host/lib/legacy/usrp_config.h rename to usrp/host/lib/usrp_config.h diff --git a/usrp/host/lib/legacy/usrp_dbid.dat b/usrp/host/lib/usrp_dbid.dat similarity index 100% rename from usrp/host/lib/legacy/usrp_dbid.dat rename to usrp/host/lib/usrp_dbid.dat diff --git a/usrp/host/lib/legacy/usrp_local_sighandler.cc b/usrp/host/lib/usrp_local_sighandler.cc similarity index 97% rename from usrp/host/lib/legacy/usrp_local_sighandler.cc rename to usrp/host/lib/usrp_local_sighandler.cc index 69cde0b3..59013972 100644 --- a/usrp/host/lib/legacy/usrp_local_sighandler.cc +++ b/usrp/host/lib/usrp_local_sighandler.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -29,7 +29,7 @@ #include "config.h" #endif -#include +#include #include #include #include diff --git a/usrp/host/lib/legacy/usrp_prims.cc b/usrp/host/lib/usrp_prims.cc similarity index 99% rename from usrp/host/lib/legacy/usrp_prims.cc rename to usrp/host/lib/usrp_prims.cc index c2f74f5f..3d87d245 100644 --- a/usrp/host/lib/legacy/usrp_prims.cc +++ b/usrp/host/lib/usrp_prims.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2003,2004,2006 Free Software Foundation, Inc. + * Copyright 2003,2004,2006,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "usrp_prims.h" +#include "usrp/usrp_prims.h" #include "usrp_commands.h" #include "usrp_ids.h" #include "usrp_i2c_addr.h" diff --git a/usrp/host/lib/legacy/usrp_standard.cc b/usrp/host/lib/usrp_standard.cc similarity index 99% rename from usrp/host/lib/legacy/usrp_standard.cc rename to usrp/host/lib/usrp_standard.cc index b810f99c..b112dbe0 100644 --- a/usrp/host/lib/legacy/usrp_standard.cc +++ b/usrp/host/lib/usrp_standard.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include +#include -#include "usrp_prims.h" +#include "usrp/usrp_prims.h" #include "fpga_regs_common.h" #include "fpga_regs_standard.h" #include diff --git a/usrp/host/swig/usrp_prims.i b/usrp/host/swig/usrp_prims.i index d973c6d7..78a775cf 100644 --- a/usrp/host/swig/usrp_prims.i +++ b/usrp/host/swig/usrp_prims.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2003,2004 Free Software Foundation, Inc. + * Copyright 2003,2004,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -36,7 +36,7 @@ %{ -#include +#include %} diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/limbo/apps-inband/Makefile.am similarity index 100% rename from usrp/host/apps-inband/Makefile.am rename to usrp/limbo/apps-inband/Makefile.am diff --git a/usrp/host/apps-inband/read_packets.cc b/usrp/limbo/apps-inband/read_packets.cc similarity index 100% rename from usrp/host/apps-inband/read_packets.cc rename to usrp/limbo/apps-inband/read_packets.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_2rx.cc b/usrp/limbo/apps-inband/test_usrp_inband_2rx.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_2rx.cc rename to usrp/limbo/apps-inband/test_usrp_inband_2rx.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_2tx.cc b/usrp/limbo/apps-inband/test_usrp_inband_2tx.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_2tx.cc rename to usrp/limbo/apps-inband/test_usrp_inband_2tx.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_overrun.cc b/usrp/limbo/apps-inband/test_usrp_inband_overrun.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_overrun.cc rename to usrp/limbo/apps-inband/test_usrp_inband_overrun.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_ping.cc b/usrp/limbo/apps-inband/test_usrp_inband_ping.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_ping.cc rename to usrp/limbo/apps-inband/test_usrp_inband_ping.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_registers.cc b/usrp/limbo/apps-inband/test_usrp_inband_registers.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_registers.cc rename to usrp/limbo/apps-inband/test_usrp_inband_registers.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_rx.cc b/usrp/limbo/apps-inband/test_usrp_inband_rx.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_rx.cc rename to usrp/limbo/apps-inband/test_usrp_inband_rx.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc b/usrp/limbo/apps-inband/test_usrp_inband_timestamps.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_timestamps.cc rename to usrp/limbo/apps-inband/test_usrp_inband_timestamps.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_tx.cc b/usrp/limbo/apps-inband/test_usrp_inband_tx.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_tx.cc rename to usrp/limbo/apps-inband/test_usrp_inband_tx.cc diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/limbo/apps-inband/test_usrp_inband_underrun.cc similarity index 100% rename from usrp/host/apps-inband/test_usrp_inband_underrun.cc rename to usrp/limbo/apps-inband/test_usrp_inband_underrun.cc diff --git a/usrp/host/apps-inband/ui_nco.h b/usrp/limbo/apps-inband/ui_nco.h similarity index 100% rename from usrp/host/apps-inband/ui_nco.h rename to usrp/limbo/apps-inband/ui_nco.h diff --git a/usrp/host/apps-inband/ui_sincos.c b/usrp/limbo/apps-inband/ui_sincos.c similarity index 100% rename from usrp/host/apps-inband/ui_sincos.c rename to usrp/limbo/apps-inband/ui_sincos.c diff --git a/usrp/host/apps-inband/ui_sincos.h b/usrp/limbo/apps-inband/ui_sincos.h similarity index 100% rename from usrp/host/apps-inband/ui_sincos.h rename to usrp/limbo/apps-inband/ui_sincos.h diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/limbo/inband/Makefile.am similarity index 100% rename from usrp/host/lib/inband/Makefile.am rename to usrp/limbo/inband/Makefile.am diff --git a/usrp/host/lib/inband/dump_packets.py b/usrp/limbo/inband/dump_packets.py similarity index 100% rename from usrp/host/lib/inband/dump_packets.py rename to usrp/limbo/inband/dump_packets.py diff --git a/usrp/host/lib/inband/gen_test_packets.py b/usrp/limbo/inband/gen_test_packets.py similarity index 100% rename from usrp/host/lib/inband/gen_test_packets.py rename to usrp/limbo/inband/gen_test_packets.py diff --git a/usrp/host/lib/inband/qa_inband.cc b/usrp/limbo/inband/qa_inband.cc similarity index 100% rename from usrp/host/lib/inband/qa_inband.cc rename to usrp/limbo/inband/qa_inband.cc diff --git a/usrp/host/lib/inband/qa_inband.h b/usrp/limbo/inband/qa_inband.h similarity index 100% rename from usrp/host/lib/inband/qa_inband.h rename to usrp/limbo/inband/qa_inband.h diff --git a/usrp/host/lib/inband/qa_inband_packet_prims.cc b/usrp/limbo/inband/qa_inband_packet_prims.cc similarity index 100% rename from usrp/host/lib/inband/qa_inband_packet_prims.cc rename to usrp/limbo/inband/qa_inband_packet_prims.cc diff --git a/usrp/host/lib/inband/qa_inband_packet_prims.h b/usrp/limbo/inband/qa_inband_packet_prims.h similarity index 100% rename from usrp/host/lib/inband/qa_inband_packet_prims.h rename to usrp/limbo/inband/qa_inband_packet_prims.h diff --git a/usrp/host/lib/inband/qa_inband_usrp_server.cc b/usrp/limbo/inband/qa_inband_usrp_server.cc similarity index 100% rename from usrp/host/lib/inband/qa_inband_usrp_server.cc rename to usrp/limbo/inband/qa_inband_usrp_server.cc diff --git a/usrp/host/lib/inband/qa_inband_usrp_server.h b/usrp/limbo/inband/qa_inband_usrp_server.h similarity index 100% rename from usrp/host/lib/inband/qa_inband_usrp_server.h rename to usrp/limbo/inband/qa_inband_usrp_server.h diff --git a/usrp/host/lib/inband/symbols_usrp_channel.h b/usrp/limbo/inband/symbols_usrp_channel.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_channel.h rename to usrp/limbo/inband/symbols_usrp_channel.h diff --git a/usrp/host/lib/inband/symbols_usrp_interface_cs.h b/usrp/limbo/inband/symbols_usrp_interface_cs.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_interface_cs.h rename to usrp/limbo/inband/symbols_usrp_interface_cs.h diff --git a/usrp/host/lib/inband/symbols_usrp_low_level_cs.h b/usrp/limbo/inband/symbols_usrp_low_level_cs.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_low_level_cs.h rename to usrp/limbo/inband/symbols_usrp_low_level_cs.h diff --git a/usrp/host/lib/inband/symbols_usrp_rx.h b/usrp/limbo/inband/symbols_usrp_rx.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_rx.h rename to usrp/limbo/inband/symbols_usrp_rx.h diff --git a/usrp/host/lib/inband/symbols_usrp_rx_cs.h b/usrp/limbo/inband/symbols_usrp_rx_cs.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_rx_cs.h rename to usrp/limbo/inband/symbols_usrp_rx_cs.h diff --git a/usrp/host/lib/inband/symbols_usrp_server_cs.h b/usrp/limbo/inband/symbols_usrp_server_cs.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_server_cs.h rename to usrp/limbo/inband/symbols_usrp_server_cs.h diff --git a/usrp/host/lib/inband/symbols_usrp_tx.h b/usrp/limbo/inband/symbols_usrp_tx.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_tx.h rename to usrp/limbo/inband/symbols_usrp_tx.h diff --git a/usrp/host/lib/inband/symbols_usrp_tx_cs.h b/usrp/limbo/inband/symbols_usrp_tx_cs.h similarity index 100% rename from usrp/host/lib/inband/symbols_usrp_tx_cs.h rename to usrp/limbo/inband/symbols_usrp_tx_cs.h diff --git a/usrp/host/lib/inband/test_inband.cc b/usrp/limbo/inband/test_inband.cc similarity index 100% rename from usrp/host/lib/inband/test_inband.cc rename to usrp/limbo/inband/test_inband.cc diff --git a/usrp/host/lib/inband/usb_packet.py b/usrp/limbo/inband/usb_packet.py similarity index 100% rename from usrp/host/lib/inband/usb_packet.py rename to usrp/limbo/inband/usb_packet.py diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.cc b/usrp/limbo/inband/usrp_inband_usb_packet.cc similarity index 100% rename from usrp/host/lib/inband/usrp_inband_usb_packet.cc rename to usrp/limbo/inband/usrp_inband_usb_packet.cc diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.h b/usrp/limbo/inband/usrp_inband_usb_packet.h similarity index 100% rename from usrp/host/lib/inband/usrp_inband_usb_packet.h rename to usrp/limbo/inband/usrp_inband_usb_packet.h diff --git a/usrp/host/lib/inband/usrp_interface.mbh b/usrp/limbo/inband/usrp_interface.mbh similarity index 100% rename from usrp/host/lib/inband/usrp_interface.mbh rename to usrp/limbo/inband/usrp_interface.mbh diff --git a/usrp/host/lib/inband/usrp_rx.cc b/usrp/limbo/inband/usrp_rx.cc similarity index 100% rename from usrp/host/lib/inband/usrp_rx.cc rename to usrp/limbo/inband/usrp_rx.cc diff --git a/usrp/host/lib/inband/usrp_rx.h b/usrp/limbo/inband/usrp_rx.h similarity index 100% rename from usrp/host/lib/inband/usrp_rx.h rename to usrp/limbo/inband/usrp_rx.h diff --git a/usrp/host/lib/inband/usrp_rx_stub.cc b/usrp/limbo/inband/usrp_rx_stub.cc similarity index 100% rename from usrp/host/lib/inband/usrp_rx_stub.cc rename to usrp/limbo/inband/usrp_rx_stub.cc diff --git a/usrp/host/lib/inband/usrp_rx_stub.h b/usrp/limbo/inband/usrp_rx_stub.h similarity index 100% rename from usrp/host/lib/inband/usrp_rx_stub.h rename to usrp/limbo/inband/usrp_rx_stub.h diff --git a/usrp/host/lib/inband/usrp_server.cc b/usrp/limbo/inband/usrp_server.cc similarity index 100% rename from usrp/host/lib/inband/usrp_server.cc rename to usrp/limbo/inband/usrp_server.cc diff --git a/usrp/host/lib/inband/usrp_server.h b/usrp/limbo/inband/usrp_server.h similarity index 100% rename from usrp/host/lib/inband/usrp_server.h rename to usrp/limbo/inband/usrp_server.h diff --git a/usrp/host/lib/inband/usrp_server.mbh b/usrp/limbo/inband/usrp_server.mbh similarity index 100% rename from usrp/host/lib/inband/usrp_server.mbh rename to usrp/limbo/inband/usrp_server.mbh diff --git a/usrp/host/lib/inband/usrp_tx.cc b/usrp/limbo/inband/usrp_tx.cc similarity index 100% rename from usrp/host/lib/inband/usrp_tx.cc rename to usrp/limbo/inband/usrp_tx.cc diff --git a/usrp/host/lib/inband/usrp_tx.h b/usrp/limbo/inband/usrp_tx.h similarity index 100% rename from usrp/host/lib/inband/usrp_tx.h rename to usrp/limbo/inband/usrp_tx.h diff --git a/usrp/host/lib/inband/usrp_tx_stub.cc b/usrp/limbo/inband/usrp_tx_stub.cc similarity index 100% rename from usrp/host/lib/inband/usrp_tx_stub.cc rename to usrp/limbo/inband/usrp_tx_stub.cc diff --git a/usrp/host/lib/inband/usrp_tx_stub.h b/usrp/limbo/inband/usrp_tx_stub.h similarity index 100% rename from usrp/host/lib/inband/usrp_tx_stub.h rename to usrp/limbo/inband/usrp_tx_stub.h diff --git a/usrp/host/lib/inband/usrp_usb_interface.cc b/usrp/limbo/inband/usrp_usb_interface.cc similarity index 100% rename from usrp/host/lib/inband/usrp_usb_interface.cc rename to usrp/limbo/inband/usrp_usb_interface.cc diff --git a/usrp/host/lib/inband/usrp_usb_interface.h b/usrp/limbo/inband/usrp_usb_interface.h similarity index 100% rename from usrp/host/lib/inband/usrp_usb_interface.h rename to usrp/limbo/inband/usrp_usb_interface.h diff --git a/usrp/usrp-inband.pc.in b/usrp/usrp-inband.pc.in deleted file mode 100644 index 57e27462..00000000 --- a/usrp/usrp-inband.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: usrp-inband -Description: USRP C++ Interface with in-band signaling -Requires: usrp pmt mblock -Version: @VERSION@ -Libs: -L${libdir} -lusrp-inband -Cflags: -I${includedir} -- 2.30.2