Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into usrp2p | Nick Foster | 2010-08-10 | 88 | -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 | ||||
| * | uhd-images: do not require language check for images project | Josh Blum | 2010-08-10 | 1 | -1/+1 |
| | | |||||
| * | usrp2: work on card burner to pad the image file before a write | Josh Blum | 2010-08-10 | 2 | -12/+32 |
| | | |||||
| * | usrp2: added fpga compat number, renamed firmware proto version to compat | Josh Blum | 2010-08-09 | 5 | -16/+28 |
| | | |||||
| * | Merge branch 'uhd_fpga_features' | Josh Blum | 2010-08-09 | 2 | -3/+6 |
| |\ | |||||
| | * | Merge branch 'features' into uhd_fpga_features | Josh Blum | 2010-08-09 | 2 | -3/+6 |
| | |\ | |||||
| | | * | added compat number to usrp2 readback mux | Josh Blum | 2010-08-09 | 1 | -2/+5 |
| | | | | |||||
| | | * | makefile dependency fix for second expansion | Josh Blum | 2010-08-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'images' | Josh Blum | 2010-08-09 | 4 | -0/+150 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | uhd-images: created makefile and cmake packager for the images | Josh Blum | 2010-08-06 | 4 | -0/+150 |
| | | | | |||||
| * | | | Merge branch 'features' into uhd_fpga_features | Josh Blum | 2010-08-09 | 23 | -5878/+873 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v | ||||
| | * | | provide a way to get out of the error state without processor intervention | Matt Ettus | 2010-07-29 | 1 | -1/+4 |
| | | | | |||||
| | * | | sequence number reset upon programming streamid | Matt Ettus | 2010-07-28 | 2 | -5/+11 |
| | | | | |||||
| | * | | attempt at avoiding infinite error messages | Matt Ettus | 2010-07-28 | 1 | -5/+14 |
| | | | | |||||
| | * | | implemented "next packet" and "next burst" policies | Matt Ettus | 2010-07-28 | 3 | -24/+50 |
| | | | | |||||
| | * | | sequence errors can happen on start of burst as well. | Matt Ettus | 2010-07-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | more informative error codes | Matt Ettus | 2010-07-28 | 2 | -6/+8 |
| | | | | |||||
| | * | | cleaner error handling | Matt Ettus | 2010-07-28 | 1 | -27/+28 |
| | | | | |||||
| | * | | introduce new error types | Matt Ettus | 2010-07-28 | 3 | -34/+80 |
| | | | | |||||
| | * | | test mux and gen_context_pkt | Matt Ettus | 2010-07-28 | 1 | -3/+22 |
| | | | | |||||
| | * | | this is an output file, it shouldn't be checked in | Matt Ettus | 2010-07-28 | 1 | -5506/+0 |
| | | | | |||||
| | * | | insert protocol engine flags when requested | Matt Ettus | 2010-07-28 | 1 | -2/+6 |
| | | | | |||||
| | * | | move the streamid so it isn't at the same address as clear_state | Matt Ettus | 2010-07-28 | 2 | -2/+2 |
| | | | | |||||
| | * | | connect the demux | Matt Ettus | 2010-07-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix a typo | Matt Ettus | 2010-07-28 | 3 | -4/+4 |
| | | | | |||||
| | * | | tx error packets now muxed into the ethernet stream back to the host | Matt Ettus | 2010-07-28 | 4 | -47/+66 |
| | | | | |||||
| | * | | checkpoint. New context packet generator to report underruns and other errors | Matt Ettus | 2010-07-28 | 2 | -0/+107 |
| | | | | |||||
| | * | | move declaration ahead of use | Matt Ettus | 2010-07-19 | 1 | -5/+5 |
| | | | | |||||
| | * | | put run_tx and run_rx on the displayed LEDs | Matt Ettus | 2010-07-19 | 1 | -3/+4 |
| | | | | |||||
| | * | | remove warnings | Matt Ettus | 2010-07-16 | 2 | -3/+3 |
| | | | | |||||
| | * | | add mux and demux to build | Matt Ettus | 2010-07-15 | 1 | -0/+2 |
| | | | | |||||
| | * | | mux multiple fifo streams into one. Allows priority or round robin | Matt Ettus | 2010-07-15 | 1 | -0/+57 |
| | | | | |||||
| | * | | split fifo into 2 streams based on first line in each packet | Matt Ettus | 2010-07-15 | 1 | -0/+50 |
| | | | | |||||
| | * | | Merge branch 'reload' into ise12 | Matt Ettus | 2010-07-15 | 4 | -22/+59 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reload: fix to stop endless error packets updated tests to match new features error packets are now valid Extension Context packets error packets don't have a trailer any more streamid is now optional on data packets, set by header register trailer now has a bit to indicate successful End-of-burst hard-coded some header bits to correct values to ensure valid packets reload bit for vita rx ctrl | ||||
| | | * | | fix to stop endless error packets | Matt Ettus | 2010-07-09 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | updated tests to match new features | Matt Ettus | 2010-07-09 | 2 | -4/+9 |
| | | | | | |||||
| | | * | | error packets are now valid Extension Context packets | Matt Ettus | 2010-07-08 | 1 | -11/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error packets don't have a trailer any more streamid is now optional on data packets, set by header register trailer now has a bit to indicate successful End-of-burst hard-coded some header bits to correct values to ensure valid packets | ||||
| | | * | | reload bit for vita rx ctrl | Josh Blum | 2010-07-05 | 1 | -5/+16 |
| | | | | | |||||
| | * | | | Merge branch 'ise12' of ettus.sourcerepo.com:ettus/fpgapriv into ise12 | Matt Ettus | 2010-07-12 | 0 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | * 'ise12' of ettus.sourcerepo.com:ettus/fpgapriv: | ||||
| | | * | | | Merge branch 'master' into ise12 | Matt Ettus | 2010-07-05 | 1 | -4/+5 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * master: fix bug which caused serdes fifo to disappear | ||||
| | * | | | | Merge branch 'master' into ise12 | Matt Ettus | 2010-07-12 | 1 | -4/+5 |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | | * master: fix bug which caused serdes fifo to disappear | ||||
| | * | | | Merge branch 'master' into ise12 | Matt Ettus | 2010-06-18 | 1 | -1/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * master: proper dependency tracking for the makefile | ||||
| | * | | | | precompute udp checksums | Matt Ettus | 2010-06-15 | 1 | -5/+14 |
| | | | | | | |||||
| | * | | | | barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but all | Matt Ettus | 2010-06-14 | 7 | -275/+390 |
| | | | | | | | | | | | | | | | | | | | | | | | | seem to work ok | ||||
| * | | | | | usrp: added api call to get the subdev spec | Josh Blum | 2010-08-09 | 4 | -0/+20 |
| | | | | | | |||||
| * | | | | | uhd: created library code to handle paths for images and modules | Josh Blum | 2010-08-09 | 6 | -50/+148 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - read from environment variable paths - utility functions to get paths and search for images - modified load modules to call the utility functions - added private header constants.hpp to contain cmake variables of interest - modified version.cpp to use this constants file | ||||
| * | | | | | uhd: moved utils specific cmake stuff into utils cmake file | Josh Blum | 2010-08-08 | 2 | -58/+64 |
| | | | | | | |||||
| * | | | | | uhd: fix device recv docs on timeout, also fix typo | Josh Blum | 2010-08-08 | 2 | -7/+2 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'codec_gains' | Josh Blum | 2010-08-06 | 26 | -446/+738 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/mimo_usrp.cpp host/lib/usrp/simple_usrp.cpp host/test/CMakeLists.txt | ||||
| | * | | | | uhd: use int to round down for gain group | Josh Blum | 2010-08-06 | 1 | -5/+2 |
| | | | | | |