Commit Graph

294 Commits

Author SHA1 Message Date
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 56a14554d3 Add required include directory for new header organization 2009-10-01 12:47:24 -07:00
Thomas Tsou 026203de61 Added config.h headers to fix win32 build 2009-10-01 13:33:33 -04:00
Johnathan Corgan 53ed3fef34 Consolidate conditional headers into libusb_types.h, use automake 2009-09-29 18:29:44 -07:00
Thomas Tsou 487fa3ec68 Change write_internal_ram in usrp_prims to print signed error code 2009-09-23 18:05:16 -04:00
ttsou 2cdcb5fd1e Allow fusb_sysconfig to build on non-linux libusb-0.12 impls 2009-09-17 14:10:04 -04:00
ttsou 1470de0e43 Comments for usrp_prims 2009-09-16 17:08:53 -04: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 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 99161214b8 Fix glitch from previous commit 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 11cd404891 Use default arguments instead of overloaded virtual constructors for cleaner interface 2009-09-16 17:08:51 -04:00
ttsou d71af59344 Integrated more usrp_prims code 2009-09-16 17:08:51 -04: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 c4765fef34 Added autotools header generation and build time version checking 2009-09-16 17:08:51 -04:00
ttsou 5871604425 Added libusb1 specific usrp_prims and usrp_basic 2009-09-15 18:06:27 -04:00
ttsou d5fbb2813b first shot at re-adding libusb-0.12 support 2009-09-15 18:06:27 -04:00
ttsou b9a28b9e3e Modify apps and swig to reflect libusb_context use 2009-09-15 18:06:27 -04:00
ttsou 14d375c3c5 Additional comments for reaping transactions 2009-09-15 18:06:27 -04:00
ttsou 5003916f60 Additional comments for reaping transactions 2009-09-15 18:06:27 -04:00
ttsou 84b362c86d non-blocking reap and fusb default buffer size change 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
Johnathan Corgan 2e1a02890e Expand frequency ranges to match hardware capability.
* Corresponds to SVN r11620:11622
* Fixes ticket 405

Reported-by: Dimitris Symeonidis <azimout@gmail.com>
Fixed-by: Matt Ettus <matt@ettus.com>
2009-09-02 08:05:04 -07:00
Johnathan Corgan c28f2d74aa Merged branch 'msg-passing' from http://gnuradio.org/git/eb.git
This is work in progress on the message passing implementation.

Passes distcheck.

Signed-off-by: Johnathan Corgan <jcorgan@corganenterprises.com>
2009-08-15 09:28:54 -07: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
git repository hosting 070639418c Added git ignore files auto created from svn:ignore properties. 2009-08-13 22:26:53 -06: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
eb b77022a4ee applied patch from ticket:358
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11443 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-15 01:49:14 +00:00
jcorgan a324987550 Revert erroneous file included in r11424
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11425 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-14 17:21:04 +00:00
jcorgan 791b37fb8c Reorganization of debian package directory
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11424 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-14 17:17:45 +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
anastas 3aafe2583c added include <cstdio> statements in several files to make it compatible with g++ 4.4
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11266 221aa14e-8319-0410-a670-987f0aec2ac5
2009-06-23 15:28:50 +00:00
jcorgan c84380718a Merged r11123:11148 from jcorgan/np into trunk.
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-27 01:54:41 +00:00
eb 88f53a140b Doc fixes.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11088 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-22 21:22:22 +00:00
eb 0ee8968fef doc fixes! work-in-progress
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11085 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-22 16:11:15 +00:00
eb be771f5eda Fixes ticket:364, ticket:365. Merged eb/t364 -r11015:11017 to trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11018 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-13 05:29:11 +00:00
eb 18784d3fa6 Built and checked in new rbfs that fix ticket:248 and ticket:290.
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-12 21:17:27 +00:00
jcorgan d587580615 Merged r10948:10959 from jcorgan/deb into trunk. Trunk passes
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-07 00:11:08 +00:00
eb c12d497f44 Additional change for ticket:371 (also fixes broken trunk ;-)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10975 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-06 01:11:54 +00:00
eb ef4dfafb05 Fix for ticket:371.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10972 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-06 00:35:04 +00:00
jblum 3ad264f067 XCVR2450 tranceive hackish fix. Re-write the atr mask, io, and oe registers 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-04-15 23:10:36 +00:00
eb e24d153baa Merged remainder of eb/t348 10637:10648. This adds a -N <nsamples>
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-19 19:59:48 +00:00
jcorgan dca27489c5 Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of 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-14 02:28:41 +00:00