diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-09-13 23:21:41 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-09-13 23:21:41 +0000 |
| commit | 4e7d048aeb80f95b19cebed9d76b79e6cbe64a9a (patch) | |
| tree | 71eb3edd8fe57d5701ccf3aa7bf624a76e8d1ec9 /usrp/host/lib/inband/usrp_usb_interface.cc | |
| parent | 6006b92a287fa5a23bcb7905f6f854d9c9dd4462 (diff) | |
Merged r6329:6428 of features/inband-usb + distcheck fixes into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6429 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/host/lib/inband/usrp_usb_interface.cc')
| -rw-r--r-- | usrp/host/lib/inband/usrp_usb_interface.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usrp/host/lib/inband/usrp_usb_interface.cc b/usrp/host/lib/inband/usrp_usb_interface.cc index b2ccba81b8..269ed2706d 100644 --- a/usrp/host/lib/inband/usrp_usb_interface.cc +++ b/usrp/host/lib/inband/usrp_usb_interface.cc @@ -53,8 +53,8 @@ usrp_usb_interface::usrp_usb_interface(mb_runtime *rt, const std::string &instan : mb_mblock(rt, instance_name, user_arg), d_fpga_debug(false), d_fake_usrp(false), - d_interp_tx(16), - d_interp_rx(16), + d_interp_tx(128), + d_decim_rx(128), d_rf_freq(10e6), d_rbf("inband_tx_rx.rbf") { @@ -87,11 +87,11 @@ usrp_usb_interface::usrp_usb_interface(mb_runtime *rt, const std::string &instan } // Read the RX interpolations - if(pmt_t interp_rx = pmt_dict_ref(usrp_dict, - pmt_intern("interp-rx"), + if(pmt_t decim_rx = pmt_dict_ref(usrp_dict, + pmt_intern("decim-rx"), PMT_NIL)) { - if(!pmt_eqv(interp_rx, PMT_NIL)) - d_interp_rx = pmt_to_long(interp_rx); + if(!pmt_eqv(decim_rx, PMT_NIL)) + d_decim_rx = pmt_to_long(decim_rx); } // Read the RBF @@ -119,7 +119,7 @@ usrp_usb_interface::usrp_usb_interface(mb_runtime *rt, const std::string &instan << d_interp_tx << std::endl; std::cout << "[USRP_USB_INTERFACE] Setting RX interpolation to " - << d_interp_rx << std::endl; + << d_decim_rx << std::endl; std::cout << "[USRP_USB_INTERFACE] Using TX interface: " << tx_interface << "\n"; @@ -305,7 +305,7 @@ usrp_usb_interface::handle_cmd_open(pmt_t data) d_urx = usrp_standard_rx::make (which_usrp, - d_interp_rx, + d_decim_rx, 1, // nchan -1, // mux 0, // set blank mode to start |