aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-10-0523-65/+698
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3052-1451/+1908
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/io_impl.cpp
| * \ \ \ \ \ \ \ Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-09-15172-194/+17955
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-256-73/+100
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed memory map to correspond to new tx_policy code.
| * | | | | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-201-20/+45
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-1911-160/+271
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'usrp2p_udpfw' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-1813-411/+489
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Moved UDP firmware update stuff out of fw_common.h into udp_fw_update.h.Nick Foster2010-08-189-113/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stuff should only go back into fw_common.h if we decide to integrate firmware update into the UHD code. Right now it's a separate Python script. Also moved udp_fw_update.h to lib/ because it's the same between USRP2 and USRP2P.
| | * | | | | | | | | | | | Removed debugging print from usrp2p_fw_update.pyNick Foster2010-08-171-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | UDP firmware update support for USRP2P.Nick Foster2010-08-1712-373/+477
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hooks are in there for USRP2, but without CPLD changes it won't support it. Added an app host/utils/usrp2p_fw_update.py to write to USRP2P over the wire. Lots of TODOs in that file. Caveat -- fw_common.h, bootloader_utils.h, and the .py app MUST ALL AGREE!
| * | | | | | | | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-1846-530/+1028
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Finished GPS driver, more or less.Nick Foster2010-08-163-38/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | Fixed behavior when no GPS present.Nick Foster2010-08-132-4/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Small fix for fngetsNick Foster2010-08-131-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Increased UART timeout for slow Jackson Labs GPSDO. Fixed up timeout code.Nick Foster2010-08-133-2/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Added timeout functionality for UART gets() calls. use fngets_timeout(). ↵Nick Foster2010-08-135-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout defined in hal_uart.h.
| * | | | | | | | | | | | | first stab at a GPS driver in gps_ctrl.cpp. not the most expandable thing in ↵Nick Foster2010-08-138-6/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the world but there's only so many GPS interfaces out there.
| * | | | | | | | | | | | | Host-side fixes for GPS UART.Nick Foster2010-08-123-14/+13
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed GPS UART stuff. Works OK.Nick Foster2010-08-123-7/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 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-125-1/+54
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-123-15/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Working support for multiple UARTs.Nick Foster2010-08-125-83/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default behavior (printf, gets, etc.) routes to DEFAULT_UART, set in hal_uart.h. Use fputstr() to print to other UARTs. Bring fgets() from hal_io.c out in hal_io.h if you want to read data from other UARTs. Still blocking. No interrupt-driven stuff yet.
| * | | | | | | | | | | | | | Branch to make use of quad UART on USRP2P.Nick Foster2010-08-114-25/+50
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2pNick Foster2010-08-112-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into usrp2pNick Foster2010-08-1088-6425/+2991
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-297-4/+134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_regs.hpp
| * | | | | | | | | | | | | | | | | Clock bugs, LED order.Nick Foster2010-07-296-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Figured out cold-start problem with Matt's help -- the DCM wasn't being reset. This also explains why USRP2 didn't like it when clocks_mimo_config was omitted -- it was sneakily resetting the DCM while enabling/disabling ref outputs. Also re-did USRP2P LED order and genericized the LED settings so LED_D is LED_D for both USRP2 and USRP2P.
| * | | | | | | | | | | | | | | | | Added back in clock_mimo_enable stuff since USRP2 breaks without it.Nick Foster2010-07-282-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should look further into initializing ALL clocks on host side.
| * | | | | | | | | | | | | | | | | Stripped out all the clock functionality except for init'ing the FPGA. Clock ↵Nick Foster2010-07-286-256/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smarts have been host-side for a while, so this is redundant code.
| * | | | | | | | | | | | | | | | | use int not rint.Nick Foster2010-07-281-3/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | ADC gain control works.Nick Foster2010-07-284-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | usrp: codec gains, don't bind functio npointers, also add prioritiesNick Foster2010-07-281-14/+57
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Widened SPI slave select bus to 16 bits in host and firmware.Nick Foster2010-07-282-4/+4
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Added gain range property to rx_codec_get.Nick Foster2010-07-281-0/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | usrp: gain group should not try to set gain elements if there are noneNick Foster2010-07-281-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Ethernet blinky light changes. Link LED works. D201 (next to PHY) blinks on ↵Nick Foster2010-07-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TX. Yellow LED on connector blinks on TX/RX.
| * | | | | | | | | | | | | | | | | Merge branch 'usrp2p2' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2pyNick Foster2010-07-288-28/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2626-446/+689
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usrp2p2
| | | * | | | | | | | | | | | | | | | | fixed template problems in gain_group_testNick Foster2010-07-261-8/+8
| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into codec_gainsNick Foster2010-07-268-91/+82
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | usrp: removed gain handler code (replaced by gain group)Josh Blum2010-07-248-412/+4
| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | usrp: added gain group support usrp2 dboard and to wrapper implementationsJosh Blum2010-07-247-16/+147
| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | usrp2: added codec impl for codec properties to usrp2Josh Blum2010-07-236-0/+132
| | | | | | | | | | | | | | | | | | | | |