Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -2/+2 |
|\| | |||||
| * | usrp2: switch the timeout to units of seconds | Josh Blum | 2010-11-11 | 1 | -2/+2 |
| | | |||||
* | | 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 | 7 | -85/+78 |
|\| | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+3 |
| | | |||||
| * | uhd: for eeprom writeback, write and set only those values changed | Josh Blum | 2010-11-05 | 1 | -2/+4 |
| | | |||||
| * | uhd: rename identifier for usrp1 eeprom, and fix offsets, add serial support ↵ | Josh Blum | 2010-11-05 | 1 | -28/+29 |
| | | | | | | | | to usrp2 | ||||
| * | Merge branch 'good_stuff' into mb_eeprom | Josh Blum | 2010-11-05 | 1 | -2/+6 |
| |\ | | | | | | | | | | | | | Conflicts: firmware/fx2/include | ||||
| * | | usrp: implement name checking on dicovery (all platforms), separate usb ↵ | Josh Blum | 2010-11-05 | 1 | -2/+16 |
| | | | | | | | | | | | | serial from serial (for now) | ||||
| * | | usrp2: move mboard eeprom instance into iface to the clock control can access it | Josh Blum | 2010-11-04 | 6 | -18/+15 |
| | | | |||||
| * | | Merge branch 'good_stuff' into mb_eeprom | Josh Blum | 2010-11-04 | 3 | -1/+18 |
| |\| | |||||
| | * | usrp2: handle real overflow packets in host, reload continuous stream cmd, ↵ | Josh Blum | 2010-10-21 | 3 | -1/+18 |
| | | | | | | | | | | | | remove firmware handling | ||||
| * | | usrp2: implemented mboard eeprom into usrp2 mboard | Josh Blum | 2010-11-04 | 3 | -60/+25 |
| |/ | |||||
* | | 2+: moved mboard_rev to usrp2/ in preparation for merging upstream | Nick Foster | 2010-11-10 | 10 | -17/+222 |
| | | |||||
* | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-10-21 | 2 | -1/+3 |
|\| | | | | | | | | | Conflicts: host/lib/usrp/CMakeLists.txt | ||||
| * | usrp: use the dboard id to prefix the subdev gain group names | Josh Blum | 2010-10-20 | 1 | -0/+2 |
| | | |||||
| * | usrp2: make the booty smaller than the number of recv frames | Josh Blum | 2010-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may fix some of our woes when the host cannot keep up. That is, with a smaller booty, the managed buffers will get freed up and the call to get buffer will never block waiting for a buffer to become free. This has several side effects: 1) Overflows are more likely to occur in the pirate thread. Pirate-based overflows will overwrite old packets, whereas socket-based overflows will discard newer incoming packets. 2) The pirate thread will continue to pull in async packets rather than loosing them in a socket-based overflow. | ||||
* | | Moved mboard rev detection to iface.cpp. | Nick Foster | 2010-10-20 | 2 | -6/+7 |
| | | | | | | | | This fixes the incorrect FPGA compat number readback bug. We were trying to read before the register set had been loaded. | ||||
* | | USRP2P: mboard rev works through props interface. | Nick Foster | 2010-10-12 | 8 | -25/+35 |
| | | | | | | | | | | | | Added usrp2_burn_mb_rev.cpp to utils. It is not installed to the utils install dir. Not all happy with the mboard_rev setup -- is_usrp2p() is too specific for a generalized mboard_rev concept. I'm not sure where else to put it so for now it stays. | ||||
* | | USRP2P: This is surprisingly involved. Adding a consistent interface to deal ↵ | Nick Foster | 2010-10-12 | 9 | -44/+57 |
| | | | | | | | | with hardware revisions. | ||||
* | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-10-08 | 4 | -111/+69 |
|\| | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/io_impl.cpp host/lib/usrp/usrp2/mboard_impl.cpp | ||||
| * | usrp2: moved samples per packet calculation into io_impl | Josh Blum | 2010-10-07 | 2 | -20/+22 |
| | | |||||
| * | uhd: replaced frame params for the zero copy interfaces with a device address | Josh Blum | 2010-10-05 | 4 | -83/+44 |
| | | | | | | | | | | | | | | | | | | | | the device address gives a key, value pair of infinite optional capabilities added a cast option to the device address to cast string to type T added call to the zero_copy_if to get send and recv frame sizes changed the usrp2 impl to calculate recv/send spp from the data transport | ||||
| * | usrp2: removed extra print-outs in init | Josh Blum | 2010-10-04 | 1 | -4/+0 |
| | | |||||
| * | uhd: implemented a double timeout (in seconds) for send and recv chains | Josh Blum | 2010-10-01 | 2 | -19/+19 |
| | | | | | | | | | | | | | | | | converted all size_t timeout_ms to double timeout bounded and alignment buffer now take double timeout added timeout to device::send and zero_copy_if::get_send_buff | ||||
* | | USRP2P: Little bit of commonality in the include files. No functional change. | Nick Foster | 2010-10-08 | 1 | -1/+0 |
| | | |||||
* | | U2P: Bootloader works, successfully loads production image. | Nick Foster | 2010-10-08 | 1 | -0/+2 |
| | | | | | | | | Split I2C into async and sync halves to keep the size of the bootloader small. | ||||
* | | USRP2P: internal reference selected by default. | Nick Foster | 2010-10-05 | 3 | -2/+21 |
| | | |||||
* | | U2P: 32/64Mbit FLASH support, internal reference support for U2P r2 | Nick Foster | 2010-10-05 | 1 | -5/+15 |
| | | |||||
* | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-10-05 | 2 | -2/+7 |
|\| | | | | | | | | | | | Conflicts: host/lib/ic_reg_maps/CMakeLists.txt host/lib/usrp/usrp2/io_impl.cpp | ||||
| * | Merge branch 'tvrx_uhd' | Josh Blum | 2010-09-30 | 1 | -0/+4 |
| |\ | |||||
| | * | usrp: added get codec rate to dboard iface | Josh Blum | 2010-09-29 | 1 | -0/+4 |
| | | | |||||
| * | | uhd: implemented recv timeout for zero copy interface | Josh Blum | 2010-09-30 | 1 | -2/+3 |
| |/ | |||||
* | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-09-30 | 3 | -7/+73 |
|\| | | | | | | | | | Conflicts: host/lib/usrp/usrp2/io_impl.cpp | ||||
| * | uhd: fix warning by adding brackets for while(cond){}; | Josh Blum | 2010-09-27 | 1 | -1/+1 |
| | | |||||
| * | usrp1: reworked the io_impl for usrp1 to use the vrt packet handler | Josh Blum | 2010-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | used dummy packers and unpackets that have a header size of zero created wrapper around the data transport to handle non-512 multiple sends honor the eob flag on send to flush the send buffer | ||||
| * | usrp2: make usrp2 dsp multi-channel compatible | Josh Blum | 2010-09-20 | 1 | -4/+20 |
| | | |||||
| * | usrp2: provide clock over mimo connector so usrp2 can share refs | Josh Blum | 2010-09-17 | 1 | -1/+50 |
| | | |||||
* | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-09-15 | 6 | -33/+54 |
|\| | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/CMakeLists.txt host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_regs.hpp | ||||
| * | uhd: added enable flags for usrp1 and usrp2 | Josh Blum | 2010-09-09 | 1 | -19/+40 |
| | | |||||
| * | usrp2: flush the error flow messages, issue the stop before register ↵ | Josh Blum | 2010-08-31 | 2 | -7/+7 |
| | | | | | | | | configure to align count | ||||
| * | usrp2: changes to mux calculation routine and usrp2 fpga compat number | Josh Blum | 2010-08-25 | 2 | -57/+1 |
| | | |||||
* | | Removing the GPS search stuff until I have time to figure out why the ↵ | Nick Foster | 2010-08-26 | 1 | -2/+2 |
| | | | | | | | | firmware side keeps timing out. | ||||
* | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-08-25 | 1 | -0/+20 |
|\| | | | | | | | | | | | Conflicts: host/include/uhd/usrp/simple_usrp.hpp host/lib/usrp/simple_usrp.cpp | ||||
| * | usrp: added get dboard iface to simple wrapper, and set gpio debug to dboard ↵ | Josh Blum | 2010-08-23 | 1 | -0/+20 |
| | | | | | | | | iface | ||||
* | | Change to get codec_impl to compile, dur. | Nick Foster | 2010-08-25 | 1 | -11/+11 |
| | | | | | | | | Changed memory map to correspond to new tx_policy code. | ||||
* | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-08-18 | 7 | -57/+47 |
|\| | |||||
| * | usrp2: template pick rate to avoid compile errors | Josh Blum | 2010-08-18 | 1 | -2/+3 |
| | |