Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'flow_ctrl' into next | Josh Blum | 2010-11-23 | 9 | -69/+184 |
|\ | |||||
| * | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl | Nick Foster | 2010-11-17 | 41 | -361/+1610 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/transport/udp_simple.cpp host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_iface.cpp host/lib/usrp/usrp2/usrp2_regs.hpp | ||||
| * | | usrp2: implemented clear state for RX and TX control, and zero sample ↵ | Josh Blum | 2010-11-08 | 5 | -39/+8 |
| | | | | | | | | | | | | command support | ||||
| * | | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-11-05 | 19 | -121/+928 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_impl.hpp | ||||
| * \ \ | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-10-28 | 6 | -10/+39 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'next' into flow_ctrl | Josh Blum | 2010-10-27 | 18 | -122/+298 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/include/uhd/types/metadata.hpp | ||||
| * | | | | | dbsrx: allow for setup time after changing the vco selection | Josh Blum | 2010-10-24 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | BasicRX: GPIOs now output 0 to decrease noise pickup. | Nick Foster | 2010-10-22 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-10-22 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'usrp2_overflow' into flow_ctrl | Josh Blum | 2010-10-21 | 3 | -1/+18 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/usrp2_impl.hpp | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-10-21 | 17 | -675/+657 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-10-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/io_impl.cpp | ||||
| * | | | | | | | | | usrp2: dont need to start streaming for this hack | Josh Blum | 2010-10-15 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | usrp2: temp fix to send dummy packets and flush so FPGA vita machine are in ↵ | Josh Blum | 2010-10-15 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | known state | ||||
| * | | | | | | | | | Merge branch 'flow_ctrl_with_fpga' | Josh Blum | 2010-10-15 | 10 | -108/+224 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | uhd: removed 1 sample buffers in test async messages | Josh Blum | 2010-10-14 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | made a hack in the vrt handler to bump 0 sample requests up to 1 sample (until the hardware supports it) | ||||
| | * | | | | | | | | | usrp2: move udp port initialization into mboard impl so its done before ↵ | Josh Blum | 2010-10-14 | 4 | -15/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | async registers are setup | ||||
| | * | | | | | | | | | udp: fix to use concurrency hint, default hint is zero when no async enabled | Josh Blum | 2010-10-13 | 2 | -11/+21 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | usrp2: added docs on flow control ricer args and using usrp2 with a switch | Josh Blum | 2010-10-13 | 4 | -17/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implemented flow control param hints in the mboard impl | ||||
| | * | | | | | | | | | usrp2: increment tx sequence after commit | Josh Blum | 2010-10-13 | 2 | -1/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | uhd: test eob ack message, usrp2: remove rx drain on init with the promise ↵ | Josh Blum | 2010-10-12 | 2 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of a reset register | ||||
| | * | | | | | | | | | usrp2: enable the cycles per ack, and drain recv without the timeout (fixes ↵ | Josh Blum | 2010-10-11 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previous conflict) | ||||
| | * | | | | | | | | | usrp2: use select rather than manually polling the simple udp socket | Josh Blum | 2010-10-11 | 3 | -29/+24 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | usrp2: use 32-bit flow control sequence numbers | Josh Blum | 2010-10-11 | 2 | -18/+13 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | usrp2: implemented flow control monitor | Josh Blum | 2010-10-11 | 5 | -21/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set registers in mboard impl to enable asyn fc packets modified microblaze code to handle dummy data packet offset | ||||
| | * | | | | | | | | | usrp2: add fc control registers, use small timeout for control packets again | Josh Blum | 2010-10-11 | 2 | -11/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | usrp2: implement fc seq number on tx header packing | Josh Blum | 2010-10-11 | 3 | -25/+41 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | usrp2: ms didnt seem to like unlocking an unlocked mutex | Josh Blum | 2010-11-22 | 1 | -3/+4 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | udp: added polling alternative to select for mac | Josh Blum | 2010-11-17 | 1 | -0/+13 |
| | | | | | | | | | | |||||
* | | | | | | | | | | uhd: ranges symbol fix, try extern macro | Josh Blum | 2010-11-17 | 1 | -0/+7 |
| | | | | | | | | | | |||||
* | | | | | | | | | | usrp: use a spawn thread to ensure that a pirate is spawned before ↵ | Josh Blum | 2010-11-16 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | continuing (fixes lockup issue) | ||||
* | | | | | | | | | | Merge branch 'public_master' | Josh Blum | 2010-11-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | usrp2: fix ip addr eeprom offset in motherboard eeprom parser | Josh Blum | 2010-11-16 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | uhd: removed windows warnings, added string formatting in usrp-n | Josh Blum | 2010-11-11 | 6 | -15/+15 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | uhd: fixed ranges stuff, export symbols and use doubles not iterators... | Josh Blum | 2010-11-11 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | usrp-n: populated name properties to use the generated cname from iface | Josh Blum | 2010-11-11 | 6 | -14/+28 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | usrp2: made enums for the rev types and implemented in code | Josh Blum | 2010-11-11 | 10 | -86/+173 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into usrp2p | Josh Blum | 2010-11-11 | 1 | -4/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | usrp2: fix discovery timeout, use default | Josh Blum | 2010-11-11 | 1 | -4/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-11-11 | 16 | -145/+148 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'ranges' | Josh Blum | 2010-11-11 | 10 | -104/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | dbsrx2: updated code for ranges use | Josh Blum | 2010-11-10 | 1 | -6/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | uhd: added meta-range clip and implemented in dboards, fixed step calculation | Josh Blum | 2010-11-10 | 5 | -15/+18 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | uhd: created a meta range that is a range of ranges for gains and freqs | Josh Blum | 2010-11-10 | 9 | -95/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created a templated range that that holds a start, stop, and step created a meta-range template that is a vector of ranges meta-range can calculate the overall start, stop, step or be indexed to get at components replaced instances of range.min, max, step with the functions start() stop() and step() the xcvr frequency range is now expressed in as two ranges (have to fix its clip function though) | ||||
| * | | | | | | | | | | | | usrp2: switch the timeout to units of seconds | Josh Blum | 2010-11-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | uhd: pulled in some worthwhile changes from flow control branch | Josh Blum | 2010-11-11 | 5 | -36/+63 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | usrpbbbbbbbbbbbeeeeeeeeeeee fix typo | Josh Blum | 2010-11-10 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | U2P: Ripped out the mboard_rev_t structure in favor of an enum in ↵ | Nick Foster | 2010-11-10 | 12 | -335/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usrp2_regs.hpp and some logic. Also change ethernet.c to move generic code to eth_lib. | ||||
* | | | | | | | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p-next | Nick Foster | 2010-11-10 | 36 | -261/+1304 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: firmware/microblaze/lib/u2_init.c host/lib/usrp/usrp2/clock_ctrl.cpp host/lib/usrp/usrp2/fw_common.h host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_iface.cpp host/lib/usrp/usrp2/usrp2_iface.hpp | ||||
| * | | | | | | | | | | | uhd: renamed enums to reflect new convention | Josh Blum | 2010-11-10 | 5 | -36/+36 |
| |/ / / / / / / / / / |