aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Un-doing firmware change regarding ICMP packate handling.Ben Hilburn2014-02-041-44/+34
| | | | | | | | Reverting "x300: ICMP_DUR handler fixed. Supposedly closes #256." This reverts commit 69317629f353734d5ac21dc78be105b2f0164497. Resolved Conflicts: firmware/x300/x300/x300_main.c
* Merging USRP X300 and X310 support!!Ben Hilburn2014-02-04341-552/+80132
|
* Merge branch 'origin/mwest/gain_name_check'Ben Hilburn2014-02-042-9/+59
|\
| * Added check and handling for gain names.Michael West2014-01-302-9/+59
| |
* | uhd: so Coverity doesn't complain, removed variable declarations tooBalint Seeber2014-02-031-0/+2
| |
* | uhd: disabled other use of _claimed and cond sync variables (no effect if ↵Balint Seeber2014-02-031-0/+2
| | | | | | | | previous change is used anyway)
* | uhd: disabled atomic 'claim' check for multi-threaded access to ↵Balint Seeber2014-02-031-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 compatibilityNicholas Corgan2014-01-272-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 Corgan2014-01-2422-674/+629
|\
| * 120 MHz daughterboard support, Integer-N tuning, ADF435x code consolidationNicholas Corgan2014-01-2422-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 Corgan2014-01-241-2/+2
|\ \
| * | UHDPackage: with a libusbx static library being used for installers, remove ↵Nicholas Corgan2013-12-201-2/+2
| | | | | | | | | | | | libusb-1.0 as package dependency
* | | Minor detail fixes to top-level READMENicholas Corgan2014-01-201-3/+3
| | | | | | | | | | | | | | | | | | * Updated NI-USRP URL to most recent release * Fixed supported Windows versions * Minor Mac typo
* | | Merge branch 'bug298'release_003_006_002Nicholas Corgan2014-01-152-6/+37
|\ \ \
| * | | Added timed control commands to test_timed_commands example. Added radio ↵Michael West2014-01-152-6/+37
| | | | | | | | | | | | | | | | core as subscriber to tick rate change for B200.
* | | | Updated UHD images URL to new release packageNicholas Corgan2014-01-151-3/+3
| | | |
* | | | Updating CHANGELOG for 003.006.002Ben Hilburn2014-01-141-0/+23
| | | |
* | | | Merge remote-tracking branch; fixing timed_commands exampleBen Hilburn2014-01-141-4/+5
|\| | |
| * | | BUG 298: B200: timed receive does not work on B210Michael West2014-01-091-4/+5
| |/ / | | | | | | | | | | | | BUG 299: UHD: test_timed_commands divides difference by 100 Changed stream_now to false, added assignment of time_spec to command, and fixed typo.
* / / manual: Added RF ranges of B2x0 devicesMartin Braun2014-01-131-2/+2
|/ /
* | cleaning up gpsdo docsBen Hilburn2013-12-194-26/+22
| |
* | Updated images URL to new 3.6.2 RC2 images packageNicholas Corgan2013-12-131-2/+2
|/
* Merge branch 'uhd/no_default_strip'Nicholas Corgan2013-12-131-3/+5
|\
| * cmake: removed binary-stripping from default GCC build behaviorNicholas Corgan2013-12-091-3/+5
| |
* | Merge remote-tracking branch 'origin/mergeme/fix_237'Ben Hilburn2013-12-121-4/+5
|\ \
| * | msg_task: Fixed build on Ubuntu 10.04 LTS.Moritz Fischer2013-12-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Includes for 'uint32_t/uint8_t' were missing. Compilers that care don't like if we just use uint32_t like this. * For portability boost::uint32_t and boost::uint8_t should preferrably be used. Signed-off-by: Moritz Fischer <moritz@ettus.com>
* | | Merge remote-tracking branch 'origin/mwest_coverity'Ben Hilburn2013-12-120-0/+0
|\ \ \
| * | | Fix sse2_fc32_to_sc16 converter (break on wrong line). Fix typos and ↵Michael West2013-12-063-7/+5
| | | | | | | | | | | | | | | | compiler warnings.
| * | | Merge branch 'master' into mwest_coverityMichael West2013-12-06137-1819/+3502
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: host/lib/usrp/b200/b200_iface.cpp
| * | | Added exception handlingMichael West2013-11-201-4/+8
| | | |
| * | | Merge remote branchMichael West2013-11-2010-28/+41
| |\ \ \
| | * | | Restored use of accessor to initialize value in the constructor.Michael West2013-11-011-1/+1
| | | | |
| | * | | Readability improvements.Michael West2013-11-011-2/+2
| | | | |
| | * | | Readability improvements.Michael West2013-11-011-1/+10
| | | | |
| | * | | Readability improvements.Michael West2013-11-011-2/+4
| | | | |
| | * | | Readability improvements.Michael West2013-11-011-2/+2
| | | | |
| | * | | Readability improvements and typo fix.Michael West2013-11-011-3/+3
| | | | |
| | * | | Changed reusable_barrier default size to 0 to make default behavior provide ↵Michael West2013-11-011-4/+2
| | | | | | | | | | | | | | | | | | | | protection for multiple threads. Changed member initialization of other constructor.
| | * | | Removed unnecessary check.Michael West2013-11-011-2/+2
| | | | |
| | * | | Renamed condition variable and moved it into the class to scope it and ↵Michael West2013-11-011-8/+7
| | | | | | | | | | | | | | | | | | | | guarantee only one thread would be waiting on the notification.
| | * | | Removed GCC-specific attribute for unused parametersNicholas Corgan2013-10-293-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | * This broke MSVC builds due to incompatibility * Added new UHD_UNUSED(x) macro in <uhd/config.hpp>
| * | | | Merged in branch masterMichael West2013-11-2032-967/+1114
| |\ \ \ \
| * | | | | Fixed converters and added comments for better readabilityMichael West2013-11-202-20/+48
| | |/ / / | |/| | |
| * | | | Merge branch 'master' into mwest_coverityMichael West2013-10-282-5/+7
| |\ \ \ \
| * | | | | Fixed compiler warnings.Michael West2013-10-281-5/+5
| | | | | |
| * | | | | CID 1104331: Fixed untrusted loop bound.Michael West2013-10-281-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CID 1104330: Fixed untrusted value as argument. CID 1104326: Fixed uncaught exception. CID 1104325: Fixed uncaught exception. CID 1104324: Fixed uncaught exception. CID 1104323: Fixed uncaught exception. CID 1104322: Fixed uncaught exception.
| * | | | | CID 1104332: Restored ostream format.Michael West2013-10-281-0/+2
| | | | | |
| * | | | | CID 1104295: Fixed use after free.Michael West2013-10-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CID 1104294: Fixed use after free. CID 1104293: Fixed use after free. CID 1104292: Fixed use after free.
| * | | | | CID 1104347: Fixed logically dead code.Michael West2013-10-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | CID 1104336: Fixed array comparison to 0.
| * | | | | CID 1104348: Fixed assertion.Michael West2013-10-281-1/+1
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 08:49:12 +0000