Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mb_iface' into next | Josh Blum | 2011-03-03 | 1 | -4/+0 |
|\ | | | | | | | | | Conflicts: host/lib/usrp/usrp2/usrp2_iface.hpp | ||||
* \ | Merge branch 'master' into next | Josh Blum | 2011-03-03 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_impl.cpp | ||||
| * | usrp2: only include fw_common when needed, remove virtual send/recv, not exposed | Josh Blum | 2011-03-02 | 1 | -0/+1 |
| | | |||||
* | | uhd: replaced instanced of std::exception with the uhd exceptions | Josh Blum | 2011-02-24 | 1 | -4/+3 |
| | | |||||
* | | uhd: renamed the assert header to assert has | Josh Blum | 2011-02-24 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | only the assert has implementation is in this header uhd assert throw moved to the exception header updated code base includes to match | ||||
* | | uhd: moved exception to top level include | Josh Blum | 2011-02-24 | 1 | -1/+1 |
|/ | |||||
* | usrp2: initialize _ctrl_seq_num to remove many valgrind warnings | Josh Blum | 2011-02-09 | 1 | -1/+2 |
| | |||||
* | next: generalized the GPS interface to any USRP device. just give it a ↵ | Nick Foster | 2011-01-17 | 1 | -0/+8 |
| | | | | | | | function to write/read strings to UART. not sure if i'm happy with the interface; maybe inheriting is cleaner. this works though. gps interface for usrp2 is disabled right now in mboard_impl. | ||||
* | usrp2: implemented get time last pps | Josh Blum | 2010-12-30 | 1 | -14/+0 |
| | | | | | | | | | renamed the enum for the pps time added calls to single and multi wrappers set time unknown pps now simpler removed peek64 stuff from host + fw please test | ||||
* | usrp-n: simplify ctrl response error so it cant throw, also increase timeout ↵ | Josh Blum | 2010-12-08 | 1 | -2/+4 |
| | | | | while we are at it | ||||
* | usrp2: cover both rev3 cases for usrp2 revision numbers | Josh Blum | 2010-11-24 | 1 | -2/+6 |
| | |||||
* | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl | Nick Foster | 2010-11-17 | 1 | -6/+93 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | uhd: removed windows warnings, added string formatting in usrp-n | 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 | 1 | -1/+1 |
| | | |||||
| * | usrp2: made enums for the rev types and implemented in code | Josh Blum | 2010-11-11 | 1 | -9/+33 |
| | | |||||
| * | 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 | 1 | -17/+9 |
| | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | |||||
| * | | 2+: moved mboard_rev to usrp2/ in preparation for merging upstream | Nick Foster | 2010-11-10 | 1 | -4/+4 |
| | | | |||||
| * | | Moved mboard rev detection to iface.cpp. | Nick Foster | 2010-10-20 | 1 | -2/+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 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| | | | | | | | | | | | | with hardware revisions. | ||||
| * | | Support for NMEA reads. Uses NMEA parsing instead of Jackson Labs parsing. | Nick Foster | 2010-08-13 | 1 | -8/+21 |
| | | | | | | | | | | | | No multibaud support yet. read/write_uart() now do multiple-packet writes in multiples of 20 bytes (hardcoded). | ||||
| * | | GPS interface works for Jackson Labs devices. | Nick Foster | 2010-08-13 | 1 | -2/+1 |
| | | | |||||
| * | | Host-side fixes for GPS UART. | Nick Foster | 2010-08-12 | 1 | -5/+5 |
| | | | |||||
| * | | Added host-side support for UART messaging. | Nick Foster | 2010-08-12 | 1 | -0/+42 |
| | | | | | | | | | | | | Have not yet added GPS control library. Debug crap in mboard_impl.cpp constructor. | ||||
| * | | Merge branch 'master' into usrp2p | Nick Foster | 2010-08-10 | 1 | -7/+17 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was the merge from hell Conflicts: firmware/microblaze/Makefile.am firmware/microblaze/bootstrap firmware/microblaze/configure.ac firmware/microblaze/lib/Makefile.inc host/lib/CMakeLists.txt host/lib/usrp/mimo_usrp.cpp host/lib/usrp/simple_usrp.cpp host/lib/usrp/usrp2/clock_ctrl.cpp host/lib/usrp/usrp2/codec_impl.cpp host/lib/usrp/usrp2/dboard_impl.cpp host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_iface.hpp host/lib/usrp/usrp2/usrp2_impl.hpp host/lib/usrp/usrp2/usrp2_regs.hpp host/test/CMakeLists.txt | ||||
| * | | | ADC SPI works. ADC gain interface "works". | Nick Foster | 2010-07-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Host-side changes to work with the USRP2+. | Nick Foster | 2010-07-26 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change summary: Added clock register selection between USRP2/USRP2+ Added memory map selection between USRP2/USRP2+ Added ADS62P44 support for USRP2+ | ||||
* | | | | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-11-05 | 1 | -0/+3 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_impl.hpp | ||||
| * | | | usrp2: move mboard eeprom instance into iface to the clock control can access it | Josh Blum | 2010-11-04 | 1 | -0/+3 |
| | | | | |||||
* | | | | usrp2: use select rather than manually polling the simple udp socket | Josh Blum | 2010-10-11 | 1 | -3/+1 |
| | | | | |||||
* | | | | usrp2: add fc control registers, use small timeout for control packets again | Josh Blum | 2010-10-11 | 1 | -11/+1 |
|/ / / | |||||
* | / | Brought in changes to SPI to match up with parallel branch so they share a ↵ | Nick Foster | 2010-08-16 | 1 | -1/+1 |
| |/ |/| | | | | | common protocol. | ||||
* | | usrp2: added fpga compat number, renamed firmware proto version to compat | Josh Blum | 2010-08-09 | 1 | -7/+17 |
|/ | |||||
* | usrp2: add a timeout to udp control and make it large for usrp2 control ↵ | Josh Blum | 2010-07-19 | 1 | -1/+13 |
| | | | | transactions | ||||
* | usrp2: moved common defined for udp mtu and implemented change. | Josh Blum | 2010-07-07 | 1 | -4/+5 |
| | | | | | | The uhp mtu is now defined in uhd_simple.hpp. The fw common code does not need to know this information. Fixed a calculation bug in the usrp2 impl code for max samples. | ||||
* | uhd: change pack/unpack for 64-bit numbers to reflect hardware implementation | Josh Blum | 2010-07-07 | 1 | -1/+1 |
| | |||||
* | usrp2: Added a peek64 to read pairs of 32 bit numbers such as time64 | Josh Blum | 2010-07-05 | 1 | -5/+19 |
| | | | | also added a templated host to/from network conversion in byteswap.hpp (didnt use it though) | ||||
* | usrp2: increased transport buffer minimum size, and added warning | Josh Blum | 2010-07-05 | 1 | -1/+1 |
| | | | | | | added more notes on buffer size to the manual pulled in some firmware fixes from the mimo work, just to have them in here | ||||
* | usrp2: enlarged the i2c transaction size, rev-ed the firmware protocol ↵ | Josh Blum | 2010-06-17 | 1 | -1/+1 |
| | | | | number, added constants for packet sizes | ||||
* | move get clock rate into clock control | Josh Blum | 2010-06-04 | 1 | -7/+0 |
| | |||||
* | also use an mtu size recv buffer for the control packet recv | Josh Blum | 2010-06-04 | 1 | -6/+7 |
| | |||||
* | Added RSSI readback to XCVR2450. | Josh Blum | 2010-04-26 | 1 | -1/+1 |
| | | | | also fixed spi readback typo in u2 iface | ||||
* | prefixed the ASSERT_THROW macro with UHD for the sake of namespace | Josh Blum | 2010-04-26 | 1 | -8/+8 |
| | |||||
* | Added i2c interface to serial.hpp, using in usrp2_iface for i2c and eeprom. | Josh Blum | 2010-04-26 | 1 | -21/+0 |
| | |||||
* | set dboard eeprom from dboard properties | Josh Blum | 2010-04-24 | 1 | -5/+9 |
| | |||||
* | Moved reading the eeprom (dboard ids) onto the host. | Josh Blum | 2010-04-23 | 1 | -0/+61 |
| | | | | | Created a eeprom parser for the format in the dboard. Removed the support from the microblaze code. |