Michael
79245079c7
updated usrp.pc file to reflect the correct version of libusb
2009-10-27 12:13:59 -04:00
Johnathan Corgan
6eafa6b6b1
Merge branch 'osx_10.6_64_fixes' of http://gnuradio.org/git/michaelld
...
This merge adds support for OSX 10.6 in gr-audio-osx and usrp.
Conflicts:
usrp/host/lib/usrp_prims_libusb0.cc
2009-10-19 08:25:35 -07:00
Michael
d04f732630
moved all 'fprintf (stderr, ...)' calls to std::cerr, for 'universal' OSX printing of long and pointer types
2009-10-19 10:21:33 -04:00
Thomas Tsou
7b8130230d
usrp: Fixed firmware load regression
...
This fixes a bug from "Applied libusb-1.0 patch set from Thomas
Tsou <ttsou@vt.edu>" b5aa407ec2b1bdebc1c950a9428789fe50327776
The bus rescan after firmware load was stomped with the addition of
libusb-1.0 support causing the subsequent device open to fail.
libusb-1.0 doesn't (appear to) require the bus to be explicity
rescanned. The rescan is added back for libusb-0.1. For libusb-1.0
the rescan nops.
2009-10-15 21:32:11 -04:00
Thomas Tsou
40053a696c
usrp: Corrected error message
2009-10-15 21:32:01 -04:00
Thomas Tsou
b516518a93
usrp: Added missing return values
2009-10-15 21:31:24 -04:00
Michael
0001665212
OSX 10.6 x86_64 fixes for configure and libusb; Audio is next
2009-10-15 09:43:20 -04:00
Johnathan Corgan
ced8a50c39
Merge branch 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou
...
This merge fixes libusb build machinery to work for Cygwin, Darwin, Ubuntu,
and F11.
* 'libusb-1.0' of git://github.com/ttsou/gnuradio-ttsou:
usrp: Applied patch from Michael Dickens for Darwin libusb
usrp: Applied patch from Don Ward for Cygwin libusb
fix to restart libusbok checking for non-PKGCONFIG
usrp: Disabled libusb-1.0 debug output by default
merged updated libusb checks with older version
usrp: Enable debug output
usrp: Reorg of libusb error reporting
usrp: Added error checking on hash transfers
augmented search for libusb
2009-10-13 13:32:39 -07:00
Johnathan Corgan
955964d34b
Change calculation of docdir to remove trailer when in git development
2009-10-13 13:07:19 -07:00
Thomas Tsou
4f074f479e
usrp: Disabled libusb-1.0 debug output by default
...
Debug output may generate excessive amounts of information.
2009-10-12 13:26:33 -04:00
Johnathan Corgan
990f456a3c
#include "config.h" in db_wbxng.cc (for timespec, nanosleep, etc.)
...
Patch-by: Don Ward <don2387ward@sprynet.com>
2009-10-10 16:48:58 -07:00
Thomas Tsou
1ff45f0d2b
usrp: Enable debug output
...
This only works if libusb-1.0 is compiled with debug logging.
2009-10-09 15:10:13 -04:00
Thomas Tsou
0bec945f49
usrp: Reorg of libusb error reporting
...
Error messages rather than error codes are reported. Version specific
libusb error messages originate from their respective calls.
2009-10-09 15:08:35 -04:00
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