Commit Graph

311 Commits

Author SHA1 Message Date
Thomas Tsou be044ba6f1 usrp: Added error checking on hash transfers 2009-10-09 13:38:00 -04:00
Michael 1c95c05c0b augmented search for libusb 2009-10-08 17:21:15 -04:00
Johnathan Corgan 54148c21f0 Merge branch 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou
* 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou:
  usrp: Corrected build fix for libusb
  usrp: Removed unused file
2009-10-06 19:29:07 -07: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 f0191323bf Enabled RX Baseband 2009-10-05 14:37:13 -07:00
Jason Abele 4d3c587c54 First Functional TX modulator 2009-10-05 14:37:13 -07:00
Jason Abele d1d7a97718 Locking, controllable synthesizer on TX and RX
set Charge Pump Current (Icp) per design guide on schem
    set R divider to 3, so that PFD inputs are ~21MHz
    set RF output enable even when looking for AUX
2009-10-05 14:37:13 -07:00
Jason Abele 1937a8a9e8 Able to tune RX VCO, observe R and N divider output on MUXOUT 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
Thomas Tsou 2a27160457 Merge branch 'master' into libusb-1.0 2009-10-03 16:33:11 -04:00
Thomas Tsou 344ed75074 usrp: Removed unused file 2009-10-03 16:24:34 -04:00
Johnathan Corgan 3e6f8073db Fix missing update from last commit 2009-10-03 12:59:34 -07:00
Thomas Tsou e93bb9cf4a usrp: Build fix for non-pkgconfig installs of libusb 2009-10-03 13:08:04 -04: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 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