summaryrefslogtreecommitdiff
path: root/usrp
AgeCommit message (Collapse)Author
2009-09-15Fix for simultaneous tx-rx using libusb_contextsttsou
2009-09-15Applied libusb-1.0 patch set from Thomas Tsou <ttsou@vt.edu>:Johnathan Corgan
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-02Expand frequency ranges to match hardware capability.Johnathan Corgan
* Corresponds to SVN r11620:11622 * Fixes ticket 405 Reported-by: Dimitris Symeonidis <azimout@gmail.com> Fixed-by: Matt Ettus <matt@ettus.com>
2009-08-14Added git ignore files auto created from svn:ignore properties.git
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11592 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-28Merged -r11480:11507, r11508 from nldudok1/tvrx_mimo_merge_with_trunk into ↵jcorgan
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-15applied patch from ticket:358eb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11443 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-14Revert erroneous file included in r11424jcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11425 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-14Reorganization of debian package directoryjcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11424 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-09Merged r11377:11390 from jcorgan/usrp-headers in to trunk.jcorgan
* 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-06-23added include <cstdio> statements in several files to make it compatible ↵anastas
with g++ 4.4 git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11266 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-27Merged r11123:11148 from jcorgan/np into trunk.jcorgan
Adds --enable-python option to configure (defaults to yes). Using --disable-python or --enable-python=no will cause only C++ API targets to be created and installed. Several new shared libraries are now created. Where in the past, the C++ objects of the actual gnuradio blocks that were in a component were hidden inside their corresponding Python extension modules, these are now split out into a libgnuradio-foo.so library, and the _foo.so Python module is linked to that. This has been the way several top- level components have operated for some time, such as gr-audio-alsa and gr-usrp and gr-usrp2. This changeset applies that pattern to all components. C++ API users can use pkg-config to discover the cflags and libs parameters needed to include and link against these libraries. These components have not been tested: gr-comedi gr-audio-osx gr-audio-windows Passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11150 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-22Doc fixes.eb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11088 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-22doc fixes! work-in-progresseb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11085 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-13Fixes ticket:364, ticket:365. Merged eb/t364 -r11015:11017 to trunk.eb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11018 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-12Built and checked in new rbfs that fix ticket:248 and ticket:290.eb
The rbfs are built from r11012 and were compiled using Quartus II Version 7.1 build 178 06/25/2007 SP 1 SJ Web Edition. ticket:248 was actually fixed in [9485], but the updated rbfs were never checked in. Ticket:290 wasn't really a bug. The host code has always been correct. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11014 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-07Merged r10948:10959 from jcorgan/deb into trunk. Trunk passesjcorgan
distcheck. Part 1 of Debian/Ubuntu binary packaging update for 3.2 release. Creates all C++ API binary and dev packages, with their associated runtime dependencies. * Runtime shared-library packages: -libgruel -libgnuradio-omnithread -libpmt -libmblock -libgnuradio-core -libgnuradio-alsa -libgnuradio-qtgui -libusrp -libusrp2 -libgnuradio-usrp -libgnuradio-usrp2 * C++ development headers and pkg-config files for the above: -libgruel-dev -libgnuradio-omnithread-dev -libpmt-dev -libmblock-dev -libgnuradio-core-dev -libgnuradio-alsa-dev -libgnuradio-qtgui-dev -libusrp-dev -libusrp2-dev NOTE: For consistency, libqtgui.so has been renamed to libgnuradio-qtgui.so, and libgr-usrp2.so has been renamed to libgnuradio-usrp2.so. A 'gnuradio-dev' virtual package will be created that will depend upon the above -dev packages, so installing that one package will pull in all that is needed to do pure C++ development in GNU Radio. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10981 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-06Additional change for ticket:371 (also fixes broken trunk ;-)eb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10975 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-06Fix for ticket:371.eb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10972 221aa14e-8319-0410-a670-987f0aec2ac5
2009-04-15XCVR2450 tranceive hackish fix. Re-write the atr mask, io, and oe registers ↵jblum
in the set_gpio(). usrp basic overwrites the registers on init and can be harmful to an app that uses both RX and TX. set_gpio will be called when the frequency is set so tuning after initialization is required. Also, the custom xcvr set register methods were replaced will calls to common_* git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10853 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-19Merged remainder of eb/t348 10637:10648. This adds a -N <nsamples>eb
argument to usrp_siggen.py, usrp_siggen.cc and test_usrp_standard_tx.cc. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10650 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-14Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of ↵jcorgan
SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-05New standalone firmware, burn_dbsrx_eeprom, that burns new dbid intoeb
modified DBS Rx daughterboard. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10560 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-26Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk ↵jcorgan
passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-25Merged r10501:10505 from michaelld/omnithread into trunk. Moves omnithread ↵jcorgan
header files into /gnuradio. Trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10506 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-18dont check thisjblum
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10458 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-17usrp methods for computing the mux for dual subdevicesjblum
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10457 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-17kludge the legacy: usrp subdevice 2, the 3rd subdevicejblum
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10448 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-10Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck.jcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10414 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-05whoops, restored commentjblum
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10400 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-05PYTHON_CHECK_MODULE: added extra argument for assertion tests (ex: version ↵jblum
testing) git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10399 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-02Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.jcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-31much better register settings, should work all the timematt
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10348 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-27General housekeeping--removing ancient cruft mostly.jcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10315 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17merging -r10252:10253 from developer branch to kick RX gain down in half on ↵gnychis
default git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10254 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17merging from developer branch to fix manual frequency setting problem, for ↵gnychis
real this time git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10250 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17seriously, sorry... tried to ctrl+c that but didnt get in timegnychis
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10249 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17merging r10246:10247 from developer branch to fix manual frequency setting ↵gnychis
problem git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10248 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-16merging 10218 to 10241 for full daughterboard support with in-band projectgnychis
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10244 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-12Fixes in-band code for new daughterboard API (Stefan Bruens)jcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10208 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-09added frequency offsetmatt
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10204 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-09fix for xcvr. matt
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10203 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-09More XCVR2450 fixes.jcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10202 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-08Fix sign error in XCVR2450 codejcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10201 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-05Allow setting of non-standard FPGA master clock frequency for USRP1jcorgan
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10193 221aa14e-8319-0410-a670-987f0aec2ac5
2008-12-26Fix missing set_bw call in new daughterboard API. Reconciled ↵jcorgan
implementations between different boards to return true or false (success). git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10168 221aa14e-8319-0410-a670-987f0aec2ac5
2008-12-24Merged r10071:10164 from features/cppdb-test into trunk. Implements the ↵jcorgan
fully native C++ API for the USRP. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10165 221aa14e-8319-0410-a670-987f0aec2ac5
2008-12-20Move mblock library include files into separate library. Updates to usrp ↵jcorgan
in-band code to accommodate. Tested with out-of-tree mblock application builds. Trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10144 221aa14e-8319-0410-a670-987f0aec2ac5
2008-11-03Merged r9881:9917 from jcorgan/deb-wip into trunk. Updates Debian/Ubuntu ↵jcorgan
packaging system to build trunk code on Ubuntu 8.10. Several new trunk components still need debs created. Impact on non-packaging code: * Renamed libgr_audio_alsa.so to libgnuradio-audio-alsa.so * Renamed libusrp_inband.so to libusrp-inband.so * Added PYTHON_CHECK_MODULE to build system to simplify Python dependency verification Packaging code updates: * Updated build-depends and package dependencies to be current with trunk * Added package for libgruel and libgruel-dev * Renamed library packages to use simplified names, removing the 0 or 0c2a suffix. This may not follow Debian policy, but we can revisit this if we ever go into official Debian or Ubuntu. * Remove gr-comedi from packaging * Restructured sections to eliminate 'contrib'. Since we're not official Debian, we don't need to deal with the sdcc-nf issue. * Consolidated usrp firmware packages into corresponding main packages (same as previous). git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9918 221aa14e-8319-0410-a670-987f0aec2ac5
2008-09-09trial fix for ticket:288; merged eb/fusb 9543:9544 to trunkeb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9545 221aa14e-8319-0410-a670-987f0aec2ac5
2008-09-03make warning go awayeb
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9491 221aa14e-8319-0410-a670-987f0aec2ac5