Commit Graph

34 Commits

Author SHA1 Message Date
Alexander Huemer ec6adccbbd Extract libusrp, adjust to be buildable standalone
* $ git \
    filter-branch \
    --prune-empty \
    --tree-filter \
    'find \! -path "./usrp/*" -a -type f -delete' \
    HEAD
* Craft custom configure.ac
* Update m4 macros
* Small fixes here and there

The code in doc/, firmware/ and host/swig does _not_ build at the
moment, due to m4 macros not being adhered and is disabled therefore.
2018-01-21 01:30:14 +01:00
Eric Blossom dc2588910e Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
2010-11-24 17:29:11 -08:00
Eric Blossom 5c9d25a206 Merge remote branch 'gnuradio.org/next' into test
* gnuradio.org/next:
  distcheck fix for gr-uhd
  Keep doxygen 1.7.1 from crashing.
  uhd: swig changes for templated ranges
2010-11-17 19:00:12 -08:00
Eric Blossom 3ce5c6a3f0 Keep doxygen 1.7.1 from crashing. 2010-11-17 18:52:05 -08:00
Eric Blossom 01f050a935 Fix guile related problem with gr-usrp 2010-11-16 21:40:55 -08:00
Jason Abele b84513988d Copy paste for RFX2200 in USRP1 2010-06-21 17:04:47 -07:00
Jason Abele aff599e832 Refactor WBX and adf4350 to avoid passing usrp pointer 2010-06-04 22:38:39 -07:00
Jason Abele 87bbd984a5 Clean up annoying class structure in wbx 2010-06-04 22:38:39 -07:00
Jason Abele 0ba8eaa142 Fixing wbx to use _refclk_freq() 2010-06-04 22:38:39 -07:00
JohnOrlando 656f2df789 Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1. 2010-03-30 19:54:39 -05:00
Eric Blossom 299fec1a46 Remove unnecessary implementation of flexrf::refclk_freq.
Apply patch from Alexander Chemeris <alexander.chemeris@gmail.com>
2010-01-18 12:27:45 -08:00
Thomas Tsou 593b69ca07 usrp: Cleanup of usrp_basic
Version specific libusb calls are pushed out of usrp_basic into
usrp_prims where they belong. This leads to a single usrp_basic
file. A new function in usrp_prims, usrp_deinit(), handles
shutdown specific to version 1.0.
2009-11-02 17:29:14 -05:00
Johnathan Corgan 8b3e40002a Merge branch 'wip/wbxng' of git@gnuradio.org:jcorgan
* 'wip/wbxng' of git@gnuradio.org:jcorgan:
  Clean up for work-in-progress
  Integrated gain control for TX and RX of wbxng
  Enabled RX Baseband
  First Functional TX modulator
  Locking, controllable synthesizer on TX and RX
  Able to tune RX VCO, observe R and N divider output on MUXOUT
  twiddling gpio successfully
  Clean build
  Initial compile of wbxng, properly sets db IDs
2009-10-06 18:17:18 -07:00
Johnathan Corgan 299bfe3839 Clean up for work-in-progress
Copyright updates
Trailing whitespace cleanup
Move private headers out of install
Use standard include guards
Code cleanup
2009-10-06 17:50:59 -07:00
Jason Abele a6e8d06af4 Integrated gain control for TX and RX of wbxng 2009-10-05 14:37:13 -07:00
Jason Abele 1d5822c0dc twiddling gpio successfully 2009-10-05 14:37:13 -07:00
Jason Abele 3e0eb64bf7 Clean build 2009-10-05 14:37:13 -07:00
Jason Abele acd8ef21ae Initial compile of wbxng, properly sets db IDs 2009-10-05 14:37:12 -07:00
Johnathan Corgan 5e6717ddd1 Cleanup in preparation for merge
Fix trailing whitespace
Use standard include guards
Add more missing config.h includes
Fixup emacs mode strings
Update copyright notices
2009-10-01 13:51:03 -07:00
Johnathan Corgan 53ed3fef34 Consolidate conditional headers into libusb_types.h, use automake 2009-09-29 18:29:44 -07:00
ttsou fca986b8ae Moved to single generated fusb.h, headers now generated out of lib directory 2009-09-16 17:08:53 -04:00
ttsou 3155d4132e Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration 2009-09-16 17:08:52 -04:00
ttsou 58d67dd106 Commonized more usrp_prims code and renamed libusb-0.12 files to libusb0 2009-09-16 17:08:52 -04:00
ttsou a3e0f0219d Fixed bug usb_control_transfer bug 2009-09-16 17:08:52 -04:00
ttsou ed5709023c Combined additiona usrp_prims code 2009-09-16 17:08:52 -04:00
ttsou d71af59344 Integrated more usrp_prims code 2009-09-16 17:08:51 -04:00
ttsou 6e8a7a4bf4 Intermediate fix to simplify usrp_one_time_init api 2009-09-16 17:08:51 -04:00
ttsou c4765fef34 Added autotools header generation and build time version checking 2009-09-16 17:08:51 -04:00
ttsou d5fbb2813b first shot at re-adding libusb-0.12 support 2009-09-15 18:06:27 -04:00
ttsou 2099b73475 Fix for simultaneous tx-rx using libusb_contexts 2009-09-15 18:06:27 -04:00
Johnathan Corgan b9d1da74eb Applied libusb-1.0 patch set from Thomas Tsou <ttsou@vt.edu>:
This patch set updates the usrp to support libusb-1.0. Asynchronous I/O
through libusb is added with fusb_libusb1.*, which is heavily based on
fusb_linux.*. In short, URB's and ioctl calls are replaced with
libusb_transfer structs and native calls. Transfer reaping is handled by
libusb and associated callbacks. I get 32Mb/s on all of my machines using
test_usrp_standard_rx or tx. Due to the API rewrite in 1.0 from 0.12, there
are alot of changes, many are simply name changes.

Known Issues:

Transmit and receive both work, but not at same time
(e.g. usrp_benchmark_usb.py). libusb does not create any internal threads,
so for a single session fusb_libusb1 works in the same manner as
fusb_linux with the callback called at controlled times. With multiple
libusb sessions the callback may occur at any time and threading issues
come into play causing behavior to become undefined. The use of separate
libusb_contexts _might_ solve this issue; I have not had the time to look
into it.
2009-09-15 18:06:27 -04:00
git 2985cbe8aa Added git ignore files auto created from svn:ignore properties.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11592 221aa14e-8319-0410-a670-987f0aec2ac5
2009-08-14 18:10:11 +00:00
jcorgan 3b3ba31c82 Merged -r11480:11507, r11508 from nldudok1/tvrx_mimo_merge_with_trunk into trunk. This branch was created with a corrupted merge tracking database, so manual merge and remove of merge info properties was needed.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11513 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-28 23:01:46 +00:00
jcorgan 707f3cef77 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 <usrp_*.h> 

  to #include 

  <usrp/usrp_*.h> 

  ...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
2009-07-09 02:55:51 +00:00