diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-03 14:41:22 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-03 14:41:22 -0700 |
| commit | 51c81a39cc15ac221376e5acc4eceb572e0467f9 (patch) | |
| tree | 173e2019844383a92ec9151fb286ac2943eea50a | |
| parent | 4feb0f5210b6dd1a35f32a08eccccff9d2c2d33b (diff) | |
| parent | 5918cec1b9d394f0a63dfe04b2c82df97333f1d1 (diff) | |
| download | uhd-51c81a39cc15ac221376e5acc4eceb572e0467f9.tar.gz uhd-51c81a39cc15ac221376e5acc4eceb572e0467f9.tar.bz2 uhd-51c81a39cc15ac221376e5acc4eceb572e0467f9.zip | |
Merge branch 'maint'
| -rw-r--r-- | fpga/usrp2/gpif/slave_fifo.v | 8 | ||||
| -rw-r--r-- | fpga/usrp2/top/B100/u1plus_core.v | 2 | ||||
| -rw-r--r-- | host/examples/network_relay.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fpga/usrp2/gpif/slave_fifo.v b/fpga/usrp2/gpif/slave_fifo.v index b1d642fca..e75f28913 100644 --- a/fpga/usrp2/gpif/slave_fifo.v +++ b/fpga/usrp2/gpif/slave_fifo.v @@ -150,7 +150,7 @@ module slave_fifo STATE_DATA_RX: begin - if(data_rx_src_rdy && data_rx_dst_rdy && (transfer_count != data_transfer_size)) + if(data_rx_src_rdy && data_rx_dst_rdy) transfer_count <= transfer_count + 1; else state <= STATE_IDLE; @@ -170,7 +170,7 @@ module slave_fifo STATE_DATA_TX: begin - if(data_tx_dst_rdy && data_tx_src_rdy && (transfer_count != data_transfer_size)) + if(data_tx_dst_rdy && data_tx_src_rdy) transfer_count <= transfer_count + 1; else state <= STATE_IDLE; @@ -197,8 +197,8 @@ module slave_fifo // fifo signal assignments and enables //enable fifos - assign data_rx_dst_rdy = (state == STATE_DATA_RX) && ~FX2_DF; - assign data_tx_src_rdy = (state == STATE_DATA_TX) && ~FX2_DE; + assign data_rx_dst_rdy = (state == STATE_DATA_RX) && ~FX2_DF && (transfer_count != data_transfer_size); + assign data_tx_src_rdy = (state == STATE_DATA_TX) && ~FX2_DE && (transfer_count != data_transfer_size); assign ctrl_rx_dst_rdy = (state == STATE_CTRL_RX) && ~FX2_CF; assign ctrl_tx_src_rdy = (state == STATE_CTRL_TX) && ~FX2_CE; diff --git a/fpga/usrp2/top/B100/u1plus_core.v b/fpga/usrp2/top/B100/u1plus_core.v index 26714b669..09b7e11f1 100644 --- a/fpga/usrp2/top/B100/u1plus_core.v +++ b/fpga/usrp2/top/B100/u1plus_core.v @@ -413,7 +413,7 @@ module u1plus_core // Readback mux 32 -- Slave #7 //compatibility number -> increment when the fpga has been sufficiently altered - localparam compat_num = {16'd9, 16'd1}; //major, minor + localparam compat_num = {16'd9, 16'd2}; //major, minor wire [31:0] reg_test32; diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp index a7fdb7e2e..e8f9e667f 100644 --- a/host/examples/network_relay.cpp +++ b/host/examples/network_relay.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -34,10 +34,10 @@ static const size_t insane_mtu = 9000; boost::mutex spawn_mutex; -#if defined(UHD_PLATFORM_MACOS) || defined(UHD_PLATFORM_BSD) +#if defined(UHD_PLATFORM_MACOS) //limit buffer resize on macos or it will error const size_t rx_dsp_buff_size = size_t(1e6); -#elif defined(UHD_PLATFORM_LINUX) || defined(UHD_PLATFORM_WIN32) +#else //set to half-a-second of buffering at max rate const size_t rx_dsp_buff_size = size_t(50e6); #endif |