aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrlNick Foster2010-11-1722-212/+1156
|\ | | | | | | | | | | | | | | 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
| * usrp: use a spawn thread to ensure that a pirate is spawned before ↵Josh Blum2010-11-161-0/+9
| | | | | | | | continuing (fixes lockup issue)
| * uhd: removed windows warnings, added string formatting in usrp-nJosh Blum2010-11-114-13/+13
| |
| * usrp-n: populated name properties to use the generated cname from ifaceJosh Blum2010-11-116-14/+28
| |
| * usrp2: made enums for the rev types and implemented in codeJosh Blum2010-11-119-86/+161
| |
| * Merge branch 'master' into usrp2pJosh Blum2010-11-111-4/+1
| |\
| | * usrp2: fix discovery timeout, use defaultJosh Blum2010-11-111-4/+1
| | |
| * | 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-1012-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-nextNick Foster2010-11-107-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 conventionJosh Blum2010-11-102-3/+3
| | |
| * | 2+: moved mboard_rev to usrp2/ in preparation for merging upstreamNick Foster2010-11-1010-17/+222
| | |
| * | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-10-212-1/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/CMakeLists.txt
| * | | Moved mboard rev detection to iface.cpp.Nick Foster2010-10-202-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 Foster2010-10-128-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 Foster2010-10-129-44/+57
| | | | | | | | | | | | | | | | with hardware revisions.
| * | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-10-084-111/+69
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/io_impl.cpp host/lib/usrp/usrp2/mboard_impl.cpp
| * | | | USRP2P: Little bit of commonality in the include files. No functional change.Nick Foster2010-10-081-1/+0
| | | | |
| * | | | U2P: Bootloader works, successfully loads production image.Nick Foster2010-10-081-0/+2
| | | | | | | | | | | | | | | | | | | | Split I2C into async and sync halves to keep the size of the bootloader small.
| * | | | USRP2P: internal reference selected by default.Nick Foster2010-10-053-2/+21
| | | | |
| * | | | U2P: 32/64Mbit FLASH support, internal reference support for U2P r2Nick Foster2010-10-051-5/+15
| | | | |
| * | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-10-052-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/ic_reg_maps/CMakeLists.txt host/lib/usrp/usrp2/io_impl.cpp
| * \ \ \ \ Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-09-303-7/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/io_impl.cpp
| * \ \ \ \ \ Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-09-156-33/+54
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/CMakeLists.txt host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_regs.hpp
| * | | | | | | Removing the GPS search stuff until I have time to figure out why the ↵Nick Foster2010-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firmware side keeps timing out.
| * | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-251-0/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/include/uhd/usrp/simple_usrp.hpp host/lib/usrp/simple_usrp.cpp
| * | | | | | | | Change to get codec_impl to compile, dur.Nick Foster2010-08-251-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed memory map to correspond to new tx_policy code.
| * | | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-187-57/+47
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Finished GPS driver, more or less.Nick Foster2010-08-161-29/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should detect any 115kbaud GPS on the serial port, as long as it outputs GPRMC packets. Tweaked the serial driver for a stupid off-by-one mistake.
| * | | | | | | | | Support for NMEA reads. Uses NMEA parsing instead of Jackson Labs parsing.Nick Foster2010-08-134-38/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-3/+4
| | | | | | | | | |
| * | | | | | | | | first stab at a GPS driver in gps_ctrl.cpp. not the most expandable thing in ↵Nick Foster2010-08-135-6/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the world but there's only so many GPS interfaces out there.
| * | | | | | | | | Host-side fixes for GPS UART.Nick Foster2010-08-123-14/+13
| | | | | | | | | |
| * | | | | | | | | Added host-side support for UART messaging.Nick Foster2010-08-123-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have not yet added GPS control library. Debug crap in mboard_impl.cpp constructor.
| * | | | | | | | | Added UART transactions to the DUDE/BRO protocol.Nick Foster2010-08-121-0/+11
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into usrp2pNick Foster2010-08-1011-51/+86
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-07-293-0/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_regs.hpp
| * | | | | | | | | | | ADC gain control works.Nick Foster2010-07-283-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separated digital gain and fine gain correction into separate buckets. Changed the rounding policy of gain_group to floor() rather than round().
| * | | | | | | | | | | ADC SPI works. ADC gain interface "works".Nick Foster2010-07-282-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Widened SPI slave select bus to 16 bits in host and firmware.Nick Foster2010-07-281-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Added gain range property to rx_codec_get.Nick Foster2010-07-281-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'usrp2p2' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2pyNick Foster2010-07-284-9/+97
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/codec_impl.cpp host/lib/usrp/usrp2/usrp2_impl.hpp
| | * | | | | | | | | | | Added gain support for USRP2+ ADC.Nick Foster2010-07-274-9/+96
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'codec_gains' of git@ettus.sourcerepo.com:ettus/uhdpriv into ↵Nick Foster2010-07-265-1/+130
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usrp2p2
| | | * | | | | | | | | | | usrp: added gain group support usrp2 dboard and to wrapper implementationsJosh Blum2010-07-241-3/+15
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | usrp2: added codec impl for codec properties to usrp2Josh Blum2010-07-235-0/+117
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | This is a manual merge of codec_gains2 into usrp2py.Nick Foster2010-07-275-1/+130
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2pxNick Foster2010-07-275-4/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp
| * | | | | | | | | | | | | Host-side changes to work with the USRP2+.Nick Foster2010-07-2611-103/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change summary: Added clock register selection between USRP2/USRP2+ Added memory map selection between USRP2/USRP2+ Added ADS62P44 support for USRP2+