Commit Graph

168 Commits

Author SHA1 Message Date
Alexander Huemer ec6adccbbd Extract libusrp, adjust to be buildable standalone
* $ git \
    filter-branch \
    --prune-empty \
    --tree-filter \
    'find \! -path "./usrp/*" -a -type f -delete' \
    HEAD
* Craft custom configure.ac
* Update m4 macros
* Small fixes here and there

The code in doc/, firmware/ and host/swig does _not_ build at the
moment, due to m4 macros not being adhered and is disabled therefore.
2018-01-21 01:30:14 +01:00
Don Ward 83056e43d7 Fixing missing include files and various other patches for Windows build issues. 2011-03-25 11:53:04 -04:00
Eric Blossom dc2588910e Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
2010-11-24 17:29:11 -08:00
Michael Dickens c6f56e4d15 rearrange includes to always be: internal GR, external, with GR. 2010-10-09 21:10:10 -04:00
Johnathan Corgan 32a1f42db7 Merge branch 'maint'
* maint:
  usrp2: fixes for gcc 4.5.0 compatibility
  formatting change: move break statements
  Fix unitialized variable pointed to by compiler warning
2010-08-04 18:54:55 -07:00
Eric Blossom d2529be51b formatting change: move break statements 2010-08-04 11:08:11 -07:00
Eric Blossom 50684991ff Fix unitialized variable pointed to by compiler warning 2010-08-04 11:05:38 -07:00
Jason Abele b84513988d Copy paste for RFX2200 in USRP1 2010-06-21 17:04:47 -07:00
Jason Abele 0994dfe70c Fixed WBX RX PLL enable 2010-06-04 22:38:39 -07:00
Jason Abele aff599e832 Refactor WBX and adf4350 to avoid passing usrp pointer 2010-06-04 22:38:39 -07:00
Jason Abele 87bbd984a5 Clean up annoying class structure in wbx 2010-06-04 22:38:39 -07:00
Jason Abele 0ba8eaa142 Fixing wbx to use _refclk_freq() 2010-06-04 22:38:39 -07:00
Jason Abele a27a7bb1f6 Typo in error message 2010-06-04 22:38:39 -07:00
Johnathan Corgan d6a7626bab Make C++ shared libraries versioned 2010-05-28 20:02:38 -07:00
Johnathan Corgan fa46b23ddb Merge branch 'master' into wip/burx_support
* master: (39 commits)
  Add gru.hexshort to deal with short hex constants
  Assign USB PID for Hans de Bok
  Add missing buffer allocator hint to gr_ofdm_sampler.cc
  Really fix the missing include for boost::bind
  gr-wxgui: Added additional color table entries
  Missed updates for omnithread/mblock removal
  Remove omnithreads library.
  Remove mblock library.  We hardly knew 'ye.
  Convert gr-audio-portaudio to Boost via gruel
  Further updates for removing omnithreads
  Update build configuration for OSX omnithreads changeover
  Add missing include file for boost::bind
  Convert gcell to use boost::threads instead of omnithread.
  Fix sequence error indication after stopping then restarting streaming on USRP2.
  initial move from mld_threads to gruel:: namespace threads and such
  Initial changes to remove mld_thread and instead use gruel:: namespace classes
  Fixing doxygen warnings from arb_resampler. Also, removed set_taps from public
  Fixing doxygen warnings from channelizer block.
  Fixing documentation to get rid of doxygen warnings.
  Adding documentation for fff version of othe PFB clock sync algorithm.
  ...
2010-05-11 18:00:19 -07:00
Johnathan Corgan dd4afa6919 usrp: Cleanup for merge of bitshark daughterboard code
Removed unused variable
Set default bandwidth to 8M in constructor
2010-05-11 14:13:52 -07:00
Michael Dickens 5dbc6a3bcf initial move from mld_threads to gruel:: namespace threads and such 2010-04-19 15:35:07 -06:00
Jason Abele 2e21a12b62 Fix WBX tuning to allow DDC use in reaching 50MHz 2010-04-16 15:00:51 -07:00
JohnOrlando 656f2df789 Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1. 2010-03-30 19:54:39 -05:00
Jason Abele acd46373d4 Clarified copyright and licensing 2010-02-19 15:39:01 -08:00
Eric Blossom 299fec1a46 Remove unnecessary implementation of flexrf::refclk_freq.
Apply patch from Alexander Chemeris <alexander.chemeris@gmail.com>
2010-01-18 12:27:45 -08:00
Eric Blossom cdb3df98bb Remove assert(dac_rate() == 128000000).
Applied patch from Alexander Chemeris <alexander.chemeris@gmail.com>
that allows non 64MHz clocking on USRP1.
2010-01-18 12:23:57 -08:00
Jason Abele 53facbe9b5 Remove wbxng tx gain dependence on pga gain 2010-01-05 15:12:36 -08:00
Jason Abele 153bb9417f Added antenna select support for new board rev 2010-01-04 11:30:52 -08:00
Jason Abele 9dfdd79bf7 Fixing bad tuning range code 2010-01-04 11:20:47 -08:00
Jason Abele ed7a822c3a WBXNG: Can not enable/disable ADF4350 from set_enable()
Incorrect powerdown in RX deconstructor
       Expanded range of frequencies to attempt locking
2010-01-04 11:20:47 -08:00
Jason Abele f521a5977e WBXNG: power on/off TXMOD and Synth/VCO with set_enable
No similar function on RX, so RX is always on?
2010-01-04 11:20:46 -08:00
Jason Abele dad9cad9bf WBXNG: set ADF4350 to low spur mode 2010-01-04 11:20:46 -08:00
Thomas Tsou 57e55a5a33 usrp: Corrected error message 2009-12-01 09:57:15 -05:00
Matt Ettus 0d989b33d7 same bug as on the U2, found by Stephen Lai 2009-11-26 11:28:59 -08:00
Thomas Tsou 593b69ca07 usrp: Cleanup of usrp_basic
Version specific libusb calls are pushed out of usrp_basic into
usrp_prims where they belong. This leads to a single usrp_basic
file. A new function in usrp_prims, usrp_deinit(), handles
shutdown specific to version 1.0.
2009-11-02 17:29:14 -05:00
Thomas Tsou e3ca79c2fa usrp: Check return value in fusb_libusb1 _reap()
The old fusb_libusb1 _reap() call always returned true except on
error. With this commit it checks that a transfer is actually
reaped and returns false otherwise.
2009-11-02 17:09:00 -05:00
Jason Abele 6619994b0a Fixing prescaler and disable aux synth output on wbxng 2009-10-29 19:26:47 -08: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
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
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