Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Nicholas Corgan | 2014-03-17 | 1 | -1/+9 |
|\ | |||||
| * | Merge branch 'maint' into usb/serial_fix | Nicholas Corgan | 2014-03-17 | 3 | -30/+44 |
| |\ | |||||
| * | | usb: better processing of strings from libusb | Nicholas Corgan | 2014-02-14 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | * When overwriting a string field with a shorter string, libusb doesn't erase extra characters * Extra processing of this string (already done by load_eeprom) removes extraneous characters | ||||
* | | | uhd: Fixed WSA bugs (superfluous %s, getsockopt parameters) | Patrick Sisterhen | 2014-03-16 | 1 | -5/+7 |
| | | | |||||
* | | | uhd: prelim fix for windows-based UDP transport | Martin Braun | 2014-03-16 | 2 | -2/+79 |
| | | | |||||
* | | | Merge clock and PPS fixes. | Ben Hilburn | 2014-03-15 | 6 | -53/+130 |
|\ \ \ | |||||
| * | | | Addressed comments from review. | michael-west | 2014-03-15 | 4 | -40/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Fixed typos. - Renamed reset() to reset_clocks(). - Created wait_for_ref_locked() function. | ||||
| * | | | - Added wait for reference clock to lock. | michael-west | 2014-02-21 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | - Modified wait for GPSDO time setting to timeout after 1 second. | ||||
| * | | | Fixed bug found during testing where internal clock reference was taking ↵ | Michael West | 2014-02-20 | 3 | -11/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | several seconds to lock. Added reset to the clock control and called it whenever the clock reference is changed. | ||||
| * | | | - Fix for BUG #264: ./test_pps_input --source external passes even with no 1 ↵ | Michael West | 2014-02-18 | 4 | -37/+81 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | PPS on external input on X3xx - Fixed behavior of PPS and clock references to be consistent and intuitive. -- Added detection of clock reference and PPS. -- Changed order of precedence to external, gpsdo, internal for default of clock and PPS. -- Throws runtime error if the user requests a reference clock or PPS that is not present. - Bumped FPGA compatibility to 4. | ||||
* | | | Merging fix for multi-channel recv overflow handling. | Ben Hilburn | 2014-03-14 | 1 | -25/+38 |
|\ \ \ | |||||
| * | | | Fix for BUG #390: RIO & UHD: multi-channel recv() does not notify there has ↵ | michael-west | 2014-03-07 | 1 | -25/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | been an overflow - Corrected flush algorithm - Cached metadata for overflow during call to handler | ||||
* | | | | Merging fix for NULL pointer deref in rpc_client::call() | Ben Hilburn | 2014-03-14 | 1 | -12/+20 |
|\ \ \ \ | |||||
| * | | | | Added handling for responses that do not have data. | michael-west | 2014-03-13 | 1 | -11/+14 |
| | | | | | |||||
| * | | | | Added assertion to make sure we are resizing buffer to a value >0. | michael-west | 2014-03-11 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Fix for Bug #378: rpc_client::call() dereferences NULL pointers | michael-west | 2014-03-07 | 1 | -3/+6 |
| |/ / / | | | | | | | | | | | | | - Added check for empty data before write | ||||
* | | | | Merging fixes for subdev specs in B2xx. | Ben Hilburn | 2014-03-14 | 3 | -47/+42 |
|\ \ \ \ | |||||
| * | | | | b200: Added channel mapping capabilities | Martin Braun | 2014-02-25 | 3 | -47/+42 |
| | |_|/ | |/| | | |||||
* | | | | Merge Ethernet, MTU, and frame size fixes. | Ben Hilburn | 2014-03-14 | 3 | -17/+17 |
|\ \ \ \ | |||||
| * | | | | x300 mtu: Removed magic number, minor manual updates | Martin Braun | 2014-02-18 | 3 | -17/+17 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'origin/martin/subdev_spec_bug_B' | Ben Hilburn | 2014-03-14 | 8 | -149/+221 |
|\ \ \ \ | |||||
| * \ \ \ | x300: Merged Michaels segfault fix | Martin Braun | 2014-03-10 | 1 | -11/+12 |
| |\ \ \ \ | |||||
| | * | | | | - Fixed segmentation fault when using X3x0 with daughterboards in 4x4 ↵ | michael-west | 2014-03-06 | 1 | -11/+12 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | configuration. - Updated index of dboard_manager dictionary to include mboard. | ||||
| * | | | | x300: Added comments on mb/chan search code | Martin Braun | 2014-03-10 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Removed spurious UHD_VAR. | Martin Braun | 2014-03-10 | 2 | -10/+0 |
| | | | | | |||||
| * | | | | utils: added subdev selection to cal tools | Martin Braun | 2014-03-10 | 4 | -18/+66 |
| | | | | | |||||
| * | | | | uhd: added channel mapping support to multi_usrp | Martin Braun | 2014-03-10 | 1 | -0/+12 |
| | | | | | |||||
| * | | | | x300: added channel mapping capabilities | Martin Braun | 2014-03-10 | 3 | -73/+111 |
| | | | | | |||||
| * | | | | x300: merged subdev update routines for tx and rx | Martin Braun | 2014-03-10 | 3 | -46/+26 |
| | | | | | |||||
| * | | | | x300: remove data that was duplicating property tree | Martin Braun | 2014-03-10 | 2 | -20/+19 |
| |/ / / | |||||
* | | | | Merge remote-tracking branch 'origin/mwest/gain_name_check' | Ben Hilburn | 2014-03-14 | 1 | -26/+14 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Addressed comments from code review. | michael-west | 2014-02-21 | 1 | -26/+14 |
| | |/ | |/| | | | | | | | | | | - Created macro for gain name error. - Fixed typos. | ||||
* | | | rpc: Make usrp3 compile again on RHEL6. | Moritz | 2014-02-26 | 1 | -9/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * boost::asio::connect appears in boost 1.47 added conditional for older machines * boost::system::get_system_category() instead of boost::system::system_category. Signed-off-by: Moritz <moritz@ettus.com> | ||||
* | | | boost: Bump required boost version to 1.41. | Moritz Fischer | 2014-02-25 | 1 | -8/+4 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | * The addition of boost::property_tree entails dependency on 1.41 or higher. * Old versions have been removed from the boost_ADDITIONAL_VERSIONS variable. * Removed future untested (possibly API breaking) versions of boost beyond currently released boost stable of 1.55. Signed-off-by: Moritz Fischer <moritz@ettus.com> | ||||
* / | b200: Fixed bug in rx_dsp_core_3000 that would assume 3 halfbands and X300 ↵ | Ashish Chaudhari | 2014-02-19 | 3 | -30/+44 |
|/ | | | | settings interface. | ||||
* | Updated images URL to UHD 3.7.0 imagesrelease_003_007_000 | Nicholas Corgan | 2014-02-14 | 1 | -1/+1 |
| | |||||
* | Pushing the bulk of UHD-3.7.0 code. | Ben Hilburn | 2014-02-14 | 29 | -258/+899 |
| | |||||
* | Merging USRP X300 and X310 support!! | Ben Hilburn | 2014-02-04 | 151 | -551/+14775 |
| | |||||
* | Merge branch 'origin/mwest/gain_name_check' | Ben Hilburn | 2014-02-04 | 2 | -9/+59 |
|\ | |||||
| * | Added check and handling for gain names. | Michael West | 2014-01-30 | 2 | -9/+59 |
| | | |||||
* | | uhd: so Coverity doesn't complain, removed variable declarations too | Balint Seeber | 2014-02-03 | 1 | -0/+2 |
| | | |||||
* | | uhd: disabled other use of _claimed and cond sync variables (no effect if ↵ | Balint Seeber | 2014-02-03 | 1 | -0/+2 |
| | | | | | | | | previous change is used anyway) | ||||
* | | uhd: disabled atomic 'claim' check for multi-threaded access to ↵ | Balint Seeber | 2014-02-03 | 1 | -1/+5 |
|/ | | | | | | | | | | recv_packet_demuxer_3000 The only caller is from super_packet_recv_handler, which is already not thread-safe. The only underlying transport (libusb1_zero_copy) is thread-safe, so this shouldn't have an impact. This solves the issue where (e.g. from GNU Radio), 'interrupt' is called on the worker thread while waiting for a join when worker thread is torn down (e.g. GR top block stop/wait/start), which would cause the demuxer to still think the transport was claimed, as an interrupted exception will be thrown in 'wait_for_completion' in the transport, and execution will not continue back into the demuxer to mark the transport as un-claimed, so future 'recv' streamer calls will always fail since the demux thinks the transport is still claimed from before. | ||||
* | Brought in UHD 3.6.2 MacPorts patches for OS X compatibility | Nicholas Corgan | 2014-01-27 | 2 | -4/+10 |
| | | | | * With OS X, boost::lexical_cast won't accept to_hex<boost::uint16_t> as a type | ||||
* | Merge branch 'uhd/adf435x-work' | Nicholas Corgan | 2014-01-24 | 22 | -674/+629 |
|\ | |||||
| * | 120 MHz daughterboard support, Integer-N tuning, ADF435x code consolidation | Nicholas Corgan | 2014-01-24 | 22 | -674/+629 |
| | | | | | | | | | | | | | | * Added support for new CBX-120, SBX-120, and WBX-120 daughterboards * Added implementation of Integer-N tuning for all CBX, SBX, and WBX daughterboards * Added --int-n option to examples to show how to use Integer-N tuning API * Removed duplicate ADF4350/ADF4351 code and moved it to common/adf435x_common.cpp | ||||
* | | Merge branch 'uhd/libusbx_prep' | Nicholas Corgan | 2014-01-24 | 1 | -2/+2 |
|\ \ | |||||
| * | | UHDPackage: with a libusbx static library being used for installers, remove ↵ | Nicholas Corgan | 2013-12-20 | 1 | -2/+2 |
| | | | | | | | | | | | | libusb-1.0 as package dependency | ||||
* | | | Merge branch 'bug298'release_003_006_002 | Nicholas Corgan | 2014-01-15 | 2 | -6/+37 |
|\ \ \ | |||||
| * | | | Added timed control commands to test_timed_commands example. Added radio ↵ | Michael West | 2014-01-15 | 2 | -6/+37 |
| | | | | | | | | | | | | | | | | core as subscriber to tick rate change for B200. |