Commit Graph

36 Commits

Author SHA1 Message Date
Jason Abele 266afda280 Add RFX2200 to burn-db-eeprom 2010-06-21 17:04:47 -07:00
JohnOrlando 656f2df789 Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1. 2010-03-30 19:54:39 -05:00
Michael 1c95c05c0b augmented search for libusb 2009-10-08 17:21:15 -04: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 acd8ef21ae Initial compile of wbxng, properly sets db IDs 2009-10-05 14:37:12 -07:00
Johnathan Corgan 53ed3fef34 Consolidate conditional headers into libusb_types.h, use automake 2009-09-29 18:29:44 -07:00
Thomas Tsou 6f0d406325 Fixed swig and usrp apps to work with libusb-0.12 and libusb-1.0 plus minor cleanup 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 b9a28b9e3e Modify apps and swig to reflect libusb_context use 2009-09-15 18:06:27 -04:00
Johnathan Corgan b9d1da74eb Applied libusb-1.0 patch set from Thomas Tsou <>:
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. 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: 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: 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> 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:

  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: 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-09 02:55:51 +00:00
eb e24d153baa Merged remainder of eb/t348 10637:10648. This adds a -N <nsamples>
argument to, and

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-19 19:59:48 +00:00
eb e22428eef7 New standalone firmware, burn_dbsrx_eeprom, that burns new dbid into
modified DBS Rx daughterboard.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-05 01:21:44 +00:00
jcorgan c513881b33 Merged r10071:10164 from features/cppdb-test into trunk. Implements the fully native C++ API for the USRP.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-12-24 08:10:48 +00:00
jcorgan 0b7d2189c1 Fix compiler warnings across the tree. Adds --enable-warnings-as-errors configure option. Currently compiles with no warnings with GCC 4.2.3 on Ubuntu 8.04.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-08-24 17:41:07 +00:00
eb 05efd5100f Merged features/mp-sched -r8915:9335 into the trunk. The trunk now
contains the SMP aware scheduler.  This changeset
introduces a dependency on boost 1.35 or later.
See source:gnuradio/trunk/README.building-boost for additional info.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-08-19 23:09:56 +00:00
matt 720063a4f7 new experimental daughterboards with other tuners
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-06-24 19:40:47 +00:00
eb b733faac59 Tweaks for gcc 4.3 based on patch from Marek Mahut <>.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-04-30 02:24:06 +00:00
michaelld 2114353a06 Merged build_config branch into trunk:
1) Modified top-level script:

 a) to execute code for setting or changing the library search path in
    Darwin (DYLD_LIBRARY_PATH) or Windows (PATH) on those host OSs
    only, not on other host OSs.

 b) Added local (to the component making check) library paths to those
    same search paths, since libtool doesn't do it (unlike in Linux).

2) In all AM Makefiles -except those dealing with USRP firmware-,
changes INCLUDES to AM_CPPFLAGS since the former is deprecated.

3) Changed AM_CPPFLAGS to FW_INCLUDES for commands .c.rel in USRP

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-02-21 19:16:45 +00:00
jcorgan 5c0e77db8e Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-02-08 23:32:10 +00:00
jcorgan e44f4db9fa Merged r7323:7349 from jcorgan/xcvr2450 into trunk. Ads XCVR 2450 daughterboard code. Not fully tested.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2008-01-05 04:35:41 +00:00
eb 39b125be70 Merged eb/usrp-la r6317:6320 into trunk. This deborks the dependency
on usrp-inband that was introduced in [6307].

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-09-05 20:18:28 +00:00
eb 5386b1fa25 Merged features/inband-usb r5224:6306 into trunk.
This is work-in-progress on inband signaling for the USRP1.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-09-05 01:43:43 +00:00
jcorgan 7dd3fcf9fc Merged r6271:6278 from jcorgan/t182 into trunk. Implements ticket:182.
Created new top-level component, gr-utils, to hold commonly used utility
scripts (originally in gnuradio-examples).  These now install into the 
system path, allowing their use from wherever.

Reorganization of gnuradio-examples component:

 * Commonly used utility scripts moved from python/usrp into gr-utils.
 * Examples now install into $(prefix)/share/gnuradio/examples/...
 * Channel coding examples moved into gr-trellis/src/examples, now install
   from there, only if gr-atsc itself is going to built and installed.
 * ATSC example scripts now install into example hierarchy
 * Cruft has been moved into 'limbo' in repository, do not get installed

Trunk passes 'make distcheck'.

git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-09-04 02:43:56 +00:00
matt c472fe4749 prelim wbx files
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-08-09 11:57:23 +00:00
jcorgan 930d730310 Fix missed usrpm conversion.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-07-31 04:04:45 +00:00
eb 117ea8a18b Updated license from GPL version 2 or later to GPL version 3 or later.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-07-21 03:44:38 +00:00
jcorgan 0eb7081be5 Fix missed import from usrpm conversion.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-06-27 17:42:16 +00:00
eb 87a72fff96 Merged features/inband -r4812:5218 into trunk. This group of changes

 * 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: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-05-02 04:08:47 +00:00
eb b305bc6dda fixed warning
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2007-01-13 03:22:46 +00:00
eb 7a0001d24a Updated FSF address in all files. Fixes ticket:51
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-09-13 21:30:04 +00:00
jcorgan a2923ba23e Trial fix for ticket:53.
git-svn-id: 221aa14e-8319-0410-a670-987f0aec2ac5
2006-08-24 22:42:37 +00:00
jcorgan fd1313c4db Partial fix for ticket 10 merged into trunk from

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

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