diff options
| author | Nick Foster <nick@ettus.com> | 2012-03-16 11:26:34 -0700 |
|---|---|---|
| committer | Nick Foster <nick@ettus.com> | 2012-03-16 11:27:39 -0700 |
| commit | 63991f7922a4e20888f001b802a8d8c88a8a16ee (patch) | |
| tree | 0026d0cb7a615a66c6dc90826d58015efe0a22ed | |
| parent | f91e247da23c09626cf215a7cede145b09376575 (diff) | |
| download | uhd-63991f7922a4e20888f001b802a8d8c88a8a16ee.tar.gz uhd-63991f7922a4e20888f001b802a8d8c88a8a16ee.tar.bz2 uhd-63991f7922a4e20888f001b802a8d8c88a8a16ee.zip | |
B100: enable_gpif(0) disables FIFO output clock on FX2. this prevents the "stuffing zeroes" problem and improves transport reliability.
| -rw-r--r-- | firmware/fx2/b100/usrp_main.c | 4 | ||||
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/firmware/fx2/b100/usrp_main.c b/firmware/fx2/b100/usrp_main.c index 7c4dd479d..74427b7d2 100644 --- a/firmware/fx2/b100/usrp_main.c +++ b/firmware/fx2/b100/usrp_main.c @@ -87,9 +87,9 @@ static void clear_fifo(int ep) { void enable_xfers(int enable) { if(enable) { - IFCONFIG |= bmIFSLAVE; + IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFCLKOE | bmIFSLAVE; } else { - IFCONFIG &= ~bmIFSLAVE; + IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFSLAVE; } set_led_0(enable); } diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp index 41e451481..991e6efd3 100644 --- a/host/lib/usrp/b100/b100_impl.cpp +++ b/host/lib/usrp/b100/b100_impl.cpp @@ -182,12 +182,11 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ //-- setup clock after making fx2 and before loading fpga --// _clock_ctrl = b100_clock_ctrl::make(_fx2_ctrl, device_addr.cast<double>("master_clock_rate", B100_DEFAULT_TICK_RATE)); - //load FPGA image, gpif is disabled while loading + //load FPGA image, slave xfers are disabled while loading this->enable_gpif(false); _fx2_ctrl->usrp_load_fpga(b100_fpga_image); _fx2_ctrl->usrp_fpga_reset(false); //active low reset _fx2_ctrl->usrp_fpga_reset(true); - this->enable_gpif(true); //create the control transport device_addr_t ctrl_xport_args; @@ -203,6 +202,7 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ ctrl_xport_args ); while (_ctrl_transport->get_recv_buff(0.0)){} //flush ctrl xport + this->enable_gpif(true); //////////////////////////////////////////////////////////////////// // Initialize FPGA wishbone communication |