Commit Graph

33 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
Michael Dickens c6f56e4d15 rearrange includes to always be: internal GR, external, with GR. 2010-10-09 21:10:10 -04:00
Johnathan Corgan d6a7626bab Make C++ shared libraries versioned 2010-05-28 20:02:38 -07:00
Johnathan Corgan fa46b23ddb Merge branch 'master' into wip/burx_support
* master: (39 commits)
  Add gru.hexshort to deal with short hex constants
  Assign USB PID for Hans de Bok
  Add missing buffer allocator hint to gr_ofdm_sampler.cc
  Really fix the missing include for boost::bind
  gr-wxgui: Added additional color table entries
  Missed updates for omnithread/mblock removal
  Remove omnithreads library.
  Remove mblock library.  We hardly knew 'ye.
  Convert gr-audio-portaudio to Boost via gruel
  Further updates for removing omnithreads
  Update build configuration for OSX omnithreads changeover
  Add missing include file for boost::bind
  Convert gcell to use boost::threads instead of omnithread.
  Fix sequence error indication after stopping then restarting streaming on USRP2.
  initial move from mld_threads to gruel:: namespace threads and such
  Initial changes to remove mld_thread and instead use gruel:: namespace classes
  Fixing doxygen warnings from arb_resampler. Also, removed set_taps from public
  Fixing doxygen warnings from channelizer block.
  Fixing documentation to get rid of doxygen warnings.
  Adding documentation for fff version of othe PFB clock sync algorithm.
  ...
2010-05-11 18:00:19 -07:00
Michael Dickens 5dbc6a3bcf initial move from mld_threads to gruel:: namespace threads and such 2010-04-19 15:35:07 -06:00
JohnOrlando 656f2df789 Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1. 2010-03-30 19:54:39 -05: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 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 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
Thomas Tsou e93bb9cf4a usrp: Build fix for non-pkgconfig installs of libusb 2009-10-03 13:08:04 -04:00
Johnathan Corgan 56a14554d3 Add required include directory for new header organization 2009-10-01 12:47:24 -07:00
Johnathan Corgan 53ed3fef34 Consolidate conditional headers into libusb_types.h, use automake 2009-09-29 18:29:44 -07:00
ttsou a94c5f84e1 Removed internal functions from external header file 2009-09-16 17:08:53 -04: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 0b0f523d25 Removed preprocessor declrs out of fusb.h and created separate fusb_libusb1_base.h 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
U-CERVELO\ttsou fda94fd822 changes to build on windows / cygwin 2009-09-16 17:08:52 -04:00
ttsou d5fbb2813b first shot at re-adding libusb-0.12 support 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
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
eb 117ea8a18b Updated license from GPL version 2 or later to GPL version 3 or later.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6044 221aa14e-8319-0410-a670-987f0aec2ac5
2007-07-21 03:44:38 +00:00
eb 87a72fff96 Merged features/inband -r4812:5218 into trunk. This group of changes
includes:

 * working stand-alone mblock code
 * work-in-progress on usrp inband signaling

usrp now depends on mblock, and guile is a dependency.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5221 221aa14e-8319-0410-a670-987f0aec2ac5
2007-05-02 04:08:47 +00:00
eb 0187af8e9e Merged eb/usrp-install r4723:4727 into trunk.
This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5
2007-03-07 01:43:43 +00:00
eb 58602bf71b Fix for ticket:133, merged from eb/bsd 4322:4324.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4326 221aa14e-8319-0410-a670-987f0aec2ac5
2007-01-30 00:34:14 +00:00
jcorgan 8d0b3ae3e5 Further fixes for ticket:81
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3712 221aa14e-8319-0410-a670-987f0aec2ac5
2006-10-04 20:16:12 +00:00
jcorgan 988852f0ec Fixes ticket:79.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3697 221aa14e-8319-0410-a670-987f0aec2ac5
2006-10-03 21:07:28 +00:00
eb e57ba270ce Merged -r3596:3600 of eb/ra_wb into trunk. This contains the
BSD read-ahead/write-behind fast usb support.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3601 221aa14e-8319-0410-a670-987f0aec2ac5
2006-09-21 21:23:37 +00:00
eb 7a0001d24a Updated FSF address in all files. Fixes ticket:51
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3534 221aa14e-8319-0410-a670-987f0aec2ac5
2006-09-13 21:30:04 +00:00
jcorgan fd1313c4db Partial fix for ticket 10 merged into trunk from
branches/developers/jcorgan/ticket-10

As of this merge the trunk and the above branch are identical.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3182 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-06 04:31:17 +00:00
jcorgan 99a9de4013 Houston, we have a trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3122 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-03 04:51:51 +00:00