Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'flow_ctrl' into next | Josh Blum | 2010-11-23 | 6 | -5/+22 |
|\ | |||||
| * | Firmware mem map changes for flow ctrl somehow didn't get propagated. | Nick Foster | 2010-11-18 | 3 | -2/+7 |
| | | | | | | | | Also removed firmware update fw rev checking -- it occurs to me that checking fw rev in order to update fw is counterproductive. | ||||
| * | Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl | Nick Foster | 2010-11-17 | 59 | -260/+5868 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | usrp2: implemented clear state for RX and TX control, and zero sample ↵ | Josh Blum | 2010-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | command support | ||||
| * | | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-11-05 | 3 | -14/+6 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_impl.hpp | ||||
| * \ \ | Merge branch 'garp' into flow_ctrl | Josh Blum | 2010-10-22 | 6 | -102/+145 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'usrp2_overflow' into flow_ctrl | Josh Blum | 2010-10-21 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/usrp2/usrp2_impl.hpp | ||||
| * | | | | | usrp2: handle destination port unreachable icmp in fw (kills streaming and ↵ | Josh Blum | 2010-10-13 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | update packets) | ||||
| * | | | | | usrp2: register overflow, underflow, and pps level for pic | Josh Blum | 2010-10-12 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | also fix minor build issue w/ LDADD | ||||
| * | | | | | usrp2: implemented flow control monitor | Josh Blum | 2010-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set registers in mboard impl to enable asyn fc packets modified microblaze code to handle dummy data packet offset | ||||
* | | | | | | N200 comes up with default IP and MAC when booted in safe mode (button pushed). | Nick Foster | 2010-11-22 | 7 | -21/+59 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | U2P: Ripped out the mboard_rev_t structure in favor of an enum in ↵ | Nick Foster | 2010-11-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -107/+154 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | usrp2: move mboard eeprom instance into iface to the clock control can access it | Josh Blum | 2010-11-04 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge branch 'good_stuff' into mb_eeprom | Josh Blum | 2010-11-04 | 7 | -104/+148 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'ovfl' into good_stuff | Josh Blum | 2010-11-04 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| | | |||||
| | | * | | usrp2: handle real overflow packets in host, reload continuous stream cmd, ↵ | Josh Blum | 2010-10-21 | 1 | -1/+1 |
| | | |/ | | | | | | | | | | | | | remove firmware handling | ||||
| | * / | usrp2: fw sends gratuitous arp on link-up | Josh Blum | 2010-10-22 | 7 | -103/+147 |
| | |/ | |||||
| * / | usrp2: implemented mboard eeprom into usrp2 mboard | Josh Blum | 2010-11-04 | 2 | -14/+0 |
| |/ | |||||
* | | 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 | 2 | -2/+4 |
| | | | | | | | | with hardware revisions. | ||||
* | | USRP2P: Little bit of commonality in the include files. No functional change. | Nick Foster | 2010-10-08 | 1 | -4/+2 |
| | | |||||
* | | U2P: Bootloader works, successfully loads production image. | Nick Foster | 2010-10-08 | 9 | -202/+268 |
| | | | | | | | | Split I2C into async and sync halves to keep the size of the bootloader small. | ||||
* | | U2P: Whoops. | Nick Foster | 2010-10-07 | 1 | -1/+1 |
| | | |||||
* | | U2P: Bootloader/ICAP updates. 2-stage bootloader works. Uses EEPROM for ↵ | Nick Foster | 2010-10-07 | 6 | -61/+91 |
| | | | | | | | | state info. | ||||
* | | U2P: 32/64Mbit FLASH support, internal reference support for U2P r2 | Nick Foster | 2010-10-05 | 1 | -4/+5 |
| | | |||||
* | | Change to get codec_impl to compile, dur. | Nick Foster | 2010-08-25 | 1 | -2/+2 |
| | | | | | | | | Changed memory map to correspond to new tx_policy code. | ||||
* | | Merge branch 'usrp2p_udpfw' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p | Nick Foster | 2010-08-18 | 12 | -411/+230 |
|\ \ | |||||
| * | | Moved UDP firmware update stuff out of fw_common.h into udp_fw_update.h. | Nick Foster | 2010-08-18 | 7 | -64/+86 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | UDP firmware update support for USRP2P. | Nick Foster | 2010-08-17 | 10 | -372/+169 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 usrp2p | Nick Foster | 2010-08-18 | 7 | -29/+326 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | usrp2: don't forward dbsm errors | Nick Foster | 2010-08-16 | 1 | -4/+4 |
| | | |||||
| * | IRQ-based SPI works. Don't try to do multiple transactions without waiting ↵ | Nick Foster | 2010-08-16 | 3 | -18/+20 |
| | | | | | | | | | | | | for results first. In fact, don't try to do an I2C transaction while an SPI transaction is pending. | ||||
| * | syntax | Nick Foster | 2010-08-16 | 2 | -2/+3 |
| | | |||||
| * | first stab at irq'ed spi | Nick Foster | 2010-08-16 | 3 | -6/+72 |
| | | |||||
| * | Removed NACK checking so things don't barf when daughterboards aren't connected. | Nick Foster | 2010-08-16 | 1 | -6/+7 |
| | | | | | | | | When we have real error handling in the DUDE/BRO protocol we'll add this back in. | ||||
| * | Fix warnings related to const-ness and volatile-ness. | Nick Foster | 2010-08-16 | 2 | -7/+7 |
| | | |||||
| * | Bring in changes since last week. | Nick Foster | 2010-08-10 | 1 | -18/+10 |
| | | |||||
| * | Interrupt-driven I2C. txrx_uhd uses async i2c for comms. | Nick Foster | 2010-08-10 | 4 | -24/+259 |
| | | |||||
* | | Finished GPS driver, more or less. | Nick Foster | 2010-08-16 | 2 | -9/+10 |
| | | | | | | | | 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 Foster | 2010-08-13 | 2 | -4/+3 |
| | | |||||
* | | Small fix for fngets | Nick Foster | 2010-08-13 | 1 | -2/+2 |
| | | |||||
* | | Increased UART timeout for slow Jackson Labs GPSDO. Fixed up timeout code. | Nick Foster | 2010-08-13 | 3 | -2/+3 |
| | | |||||
* | | Added timeout functionality for UART gets() calls. use fngets_timeout(). ↵ | Nick Foster | 2010-08-13 | 5 | -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 Foster | 2010-08-13 | 3 | -0/+11 |
| | | | | | | | | the world but there's only so many GPS interfaces out there. | ||||
* | | Fixed GPS UART stuff. Works OK. | Nick Foster | 2010-08-12 | 3 | -7/+5 |
| | | |||||
* | | Added UART transactions to the DUDE/BRO protocol. | Nick Foster | 2010-08-12 | 4 | -1/+43 |
| | | |||||
* | | Working support for multiple UARTs. | Nick Foster | 2010-08-12 | 5 | -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 Foster | 2010-08-11 | 4 | -25/+50 |
| | | |||||
* | | Merge branch 'master' into usrp2p | Nick Foster | 2010-08-10 | 5 | -169/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |