summaryrefslogtreecommitdiffstats
path: root/usrp2/control_lib
diff options
context:
space:
mode:
authorMatt Ettus <matt@ettus.com>2010-07-19 15:27:28 -0700
committerMatt Ettus <matt@ettus.com>2010-07-19 15:27:28 -0700
commitea087cc9fbd19ff05893178ea4395cf0f47af61b (patch)
tree4031192430dbc40bf6430fbe530a3e11348bbc0f /usrp2/control_lib
parent5922f348e19fd477c311c0cadef4eb5d3a17d4c6 (diff)
parent33083078546a910268ee404fc592c7df31451ebc (diff)
downloaduhd-ea087cc9fbd19ff05893178ea4395cf0f47af61b.tar.gz
uhd-ea087cc9fbd19ff05893178ea4395cf0f47af61b.tar.bz2
uhd-ea087cc9fbd19ff05893178ea4395cf0f47af61b.zip
Merge branch 'ise12' into u1e
* ise12: move declaration ahead of use put run_tx and run_rx on the displayed LEDs remove warnings add mux and demux to build mux multiple fifo streams into one. Allows priority or round robin split fifo into 2 streams based on first line in each packet precompute udp checksums barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but all seem to work ok
Diffstat (limited to 'usrp2/control_lib')
-rw-r--r--usrp2/control_lib/Makefile.srcs1
1 files changed, 1 insertions, 0 deletions
diff --git a/usrp2/control_lib/Makefile.srcs b/usrp2/control_lib/Makefile.srcs
index 095890d59..383ed97d8 100644
--- a/usrp2/control_lib/Makefile.srcs
+++ b/usrp2/control_lib/Makefile.srcs
@@ -20,6 +20,7 @@ mux8.v \
nsgpio.v \
ram_2port.v \
ram_harv_cache.v \
+ram_harvard.v \
ram_loader.v \
setting_reg.v \
settings_bus.v \