aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2/usrp2_iface.cpp
Commit message (Collapse)AuthorAgeFilesLines
* usrp2: added the concept of device locking to usrp2/nseries devicesJosh Blum2011-05-011-31/+66
| | | | | | | | | | Each iface instance can lock itself to a particular device. When the device is locked, it cannot be discovered through find. Locking works by having a lock thread periodically update a register in the firmware that says when the device was last locked. The find routine can determine if a device is locked by checking the difference between the current time and this register.
* usrp2: combined peek and poke commands and added virtual firmware registersJosh Blum2011-05-011-25/+14
| | | | | It would be nice to have persistent registers in the device to do things like device locking. Rather than invent a new communication type, we just repurposed the register manipulation.
* usrp2: improve the compatibility error messagesJosh Blum2011-04-191-6/+3
|
* usrp2: use the firmware's discovered compat numberJosh Blum2011-04-131-4/+16
|
* usrp2: add check for holler protocol, we can support backwardsJosh Blum2011-04-131-1/+1
|
* usrp2: support fw protos with older compats for various partsJosh Blum2011-04-081-20/+28
| | | | | | | | | | i2c, spi, and uart are long time no changing registers changed recently (think re-map) also, perform the fpga compat check in the make now we can find devices with out of date images
* Merge branch 'mb_iface' into nextJosh Blum2011-03-031-4/+0
|\ | | | | | | | | Conflicts: host/lib/usrp/usrp2/usrp2_iface.hpp
* \ Merge branch 'master' into nextJosh Blum2011-03-031-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 exposedJosh Blum2011-03-021-0/+1
| |
* | uhd: replaced instanced of std::exception with the uhd exceptionsJosh Blum2011-02-241-4/+3
| |
* | uhd: renamed the assert header to assert hasJosh Blum2011-02-241-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 includeJosh Blum2011-02-241-1/+1
|/
* usrp2: initialize _ctrl_seq_num to remove many valgrind warningsJosh Blum2011-02-091-1/+2
|
* next: generalized the GPS interface to any USRP device. just give it a ↵Nick Foster2011-01-171-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 ppsJosh Blum2010-12-301-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 Blum2010-12-081-2/+4
| | | | while we are at it
* usrp2: cover both rev3 cases for usrp2 revision numbersJosh Blum2010-11-241-2/+6
|
* Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrlNick Foster2010-11-171-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-nJosh Blum2010-11-111-2/+2
| |
| * usrp-n: populated name properties to use the generated cname from ifaceJosh Blum2010-11-111-1/+1
| |
| * usrp2: made enums for the rev types and implemented in codeJosh Blum2010-11-111-9/+33
| |
| * Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-11-111-2/+2
| |\
| | * usrp2: switch the timeout to units of secondsJosh Blum2010-11-111-2/+2
| | |
| * | U2P: Ripped out the mboard_rev_t structure in favor of an enum in ↵Nick Foster2010-11-101-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-nextNick Foster2010-11-101-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 conventionJosh Blum2010-11-101-1/+1
| | |
| * | 2+: moved mboard_rev to usrp2/ in preparation for merging upstreamNick Foster2010-11-101-4/+4
| | |
| * | Moved mboard rev detection to iface.cpp.Nick Foster2010-10-201-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 Foster2010-10-121-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 Foster2010-10-121-2/+2
| | | | | | | | | | | | with hardware revisions.
| * | Support for NMEA reads. Uses NMEA parsing instead of Jackson Labs parsing.Nick Foster2010-08-131-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 Foster2010-08-131-2/+1
| | |
| * | Host-side fixes for GPS UART.Nick Foster2010-08-121-5/+5
| | |
| * | Added host-side support for UART messaging.Nick Foster2010-08-121-0/+42
| | | | | | | | | | | | Have not yet added GPS control library. Debug crap in mboard_impl.cpp constructor.
| * | Merge branch 'master' into usrp2pNick Foster2010-08-101-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 Foster2010-07-281-1/+1
| | | |
| * | | Host-side changes to work with the USRP2+.Nick Foster2010-07-261-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_ctrlJosh Blum2010-11-051-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 itJosh Blum2010-11-041-0/+3
| | | |
* | | | usrp2: use select rather than manually polling the simple udp socketJosh Blum2010-10-111-3/+1
| | | |
* | | | usrp2: add fc control registers, use small timeout for control packets againJosh Blum2010-10-111-11/+1
|/ / /
* | / Brought in changes to SPI to match up with parallel branch so they share a ↵Nick Foster2010-08-161-1/+1
| |/ |/| | | | | common protocol.
* | usrp2: added fpga compat number, renamed firmware proto version to compatJosh Blum2010-08-091-7/+17
|/
* usrp2: add a timeout to udp control and make it large for usrp2 control ↵Josh Blum2010-07-191-1/+13
| | | | transactions
* usrp2: moved common defined for udp mtu and implemented change.Josh Blum2010-07-071-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 implementationJosh Blum2010-07-071-1/+1
|
* usrp2: Added a peek64 to read pairs of 32 bit numbers such as time64Josh Blum2010-07-051-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 warningJosh Blum2010-07-051-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 Blum2010-06-171-1/+1
| | | | number, added constants for packet sizes
* move get clock rate into clock controlJosh Blum2010-06-041-7/+0
|