Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'usrp_e100' into next | Josh Blum | 2010-11-23 | 2 | -3/+3 |
|\ | | | | | | | | | Conflicts: images/Makefile | ||||
| * | usrp-e100: implemented wrapper for i2c device node + ioctls, implemented ↵ | Josh Blum | 2010-11-10 | 1 | -1/+2 |
| | | | | | | | | e100 eeprom map | ||||
| * | Merge branch 'master' into usrp_e100_i2c | Josh Blum | 2010-11-10 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: host/utils/CMakeLists.txt | ||||
| * | | usrp-e100: moved kernel header to lib dir, remove the header check, default ↵ | Josh Blum | 2010-11-09 | 1 | -91/+0 |
| | | | | | | | | | | | | enable to false | ||||
| * | | Merge branch 'master' into usrp_e_next | Josh Blum | 2010-11-09 | 5 | -2/+84 |
| |\ \ | |||||
| * \ \ | Merge branch 'next' into usrp_e_next | Josh Blum | 2010-10-27 | 2 | -3/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: host/examples/CMakeLists.txt | ||||
| * \ \ \ | Merge branch 'next' into usrp_e | Josh Blum | 2010-10-27 | 14 | -241/+529 |
| |\ \ \ \ | |||||
| * | | | | | usrp_e: Add driver compatibility ioctl to header file. | Philip Balister | 2010-10-21 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e_mmap_b2 | Philip Balister | 2010-10-20 | 11 | -33/+1329 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'next' into usrp_e_mmap_b2 | Josh Blum | 2010-10-07 | 5 | -24/+48 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add flag that indicates userspace has started processing a frame. | Philip Balister | 2010-10-06 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'timeout' into usrp_e_mmap | Josh Blum | 2010-10-04 | 1 | -2/+14 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'timeout' into usrp_e_mmap | Josh Blum | 2010-10-04 | 8 | -124/+83 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into usrp_e_next | Josh Blum | 2010-09-30 | 5 | -20/+34 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove BIT macro | Philip Balister | 2010-09-26 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into usrp_e | Josh Blum | 2010-09-24 | 9 | -59/+201 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/CMakeLists.txt | ||||
| * | | | | | | | | | | | Read the ring buffer size from the kernel and use that to set up the | Philip Balister | 2010-09-21 | 1 | -18/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structures that read and write the ring buffer. | ||||
| * | | | | | | | | | | | Allow programs to find usrp_e.h header, even if it is not installed in ↵ | Philip Balister | 2010-09-09 | 1 | -0/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /usr/include/linux. | ||||
| * | | | | | | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e | Philip Balister | 2010-09-09 | 7 | -9/+290 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e | Josh Blum | 2010-08-24 | 2 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e | Josh Blum | 2010-08-23 | 2 | -0/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'next' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e_merge | Josh Blum | 2010-08-17 | 6 | -18/+215 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'split_string' of ettus.sourcerepo.com:ettus/uhdpriv into ↵ | Josh Blum | 2010-08-12 | 1 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usrp_e_merge | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'subdev_spec' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e | Josh Blum | 2010-08-11 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | usrp-e: fixed warnings and errors, missing subdev spec stuff | Josh Blum | 2010-08-11 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'flow_ctrl' into next | Josh Blum | 2010-11-23 | 2 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl | Nick Foster | 2010-11-17 | 7 | -20/+292 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command support | ||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-11-05 | 5 | -2/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_impl.hpp | ||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'next' into flow_ctrl | Josh Blum | 2010-10-27 | 12 | -201/+358 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/include/uhd/types/metadata.hpp | ||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-10-21 | 10 | -29/+1427 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'flow_ctrl_with_fpga' | Josh Blum | 2010-10-15 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | usrp2: use select rather than manually polling the simple udp socket | Josh Blum | 2010-10-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | usrp2: use 32-bit flow control sequence numbers | Josh Blum | 2010-10-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | usrp: removed deprecated interfaces simple and mimo | Josh Blum | 2010-11-23 | 3 | -915/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | uhd: added printable to string methods to ranges | Josh Blum | 2010-11-23 | 1 | -0/+1 |
| |_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | uhd: tweaking the export template instance macro | Josh Blum | 2010-11-17 | 2 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | uhd: added to printable string methods for ranges | Josh Blum | 2010-11-17 | 2 | -2/+26 |
| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | uhd: ranges symbol fix, try extern macro | Josh Blum | 2010-11-17 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | while this was legal C++, SWIG hates it | Nick Foster | 2010-11-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | uhd: fixed ranges stuff, export symbols and use doubles not iterators... | Josh Blum | 2010-11-11 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ranges' | Josh Blum | 2010-11-11 | 5 | -18/+253 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | uhd: made unit test for meta range and fixed bug | Josh Blum | 2010-11-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | uhd: added meta-range clip and implemented in dboards, fixed step calculation | Josh Blum | 2010-11-10 | 2 | -22/+64 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | uhd: created a meta range that is a range of ranges for gains and freqs | Josh Blum | 2010-11-10 | 5 | -18/+211 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
* / | | | | | | | | | | | | | | | | | | | | uhd: pulled in some worthwhile changes from flow control branch | Josh Blum | 2010-11-11 | 1 | -2/+2 |
|/ / / / / / / / / / / / / / / / / / / / | |||||
* | | | | / / / / / / / / / / / / / / / | uhd: renamed enums to reflect new convention | Josh Blum | 2010-11-10 | 1 | -2/+2 |
| |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | uhd: rename identifier for usrp1 eeprom, and fix offsets, add serial support ↵ | Josh Blum | 2010-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to usrp2 | ||||
* | | | | | | | | | | | | | | | | | | | usrp2: move mboard eeprom instance into iface to the clock control can access it | Josh Blum | 2010-11-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | usrp2: implemented mboard eeprom into usrp2 mboard | Josh Blum | 2010-11-04 | 2 | -14/+12 |
| | | | | | | | | | | | | | | | | | | |