diff options
| author | Josh Blum <josh@joshknows.com> | 2012-01-28 12:21:01 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-01-31 14:56:31 -0800 |
| commit | 8f25550d1a8ac634ee3873ae90a86d1e07dd5482 (patch) | |
| tree | d4681f031bc00b1926a04965c7506f7823cc9314 /host/lib/usrp/e100 | |
| parent | 72359ea15846ab87c781ab4d072f694e97cc3cd1 (diff) | |
| download | uhd-8f25550d1a8ac634ee3873ae90a86d1e07dd5482.tar.gz uhd-8f25550d1a8ac634ee3873ae90a86d1e07dd5482.tar.bz2 uhd-8f25550d1a8ac634ee3873ae90a86d1e07dd5482.zip | |
dsp rework: implemented new scalefactor in rx dsp core
Diffstat (limited to 'host/lib/usrp/e100')
| -rw-r--r-- | host/lib/usrp/e100/e100_impl.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/e100/io_impl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/e100/e100_impl.hpp b/host/lib/usrp/e100/e100_impl.hpp index 2ea890375..f94061a24 100644 --- a/host/lib/usrp/e100/e100_impl.hpp +++ b/host/lib/usrp/e100/e100_impl.hpp @@ -48,7 +48,7 @@ static const double E100_RX_LINK_RATE_BPS = 166e6/3/2*2; static const double E100_TX_LINK_RATE_BPS = 166e6/3/1*2; static const std::string E100_I2C_DEV_NODE = "/dev/i2c-3"; static const std::string E100_UART_DEV_NODE = "/dev/ttyO0"; -static const boost::uint16_t E100_FPGA_COMPAT_NUM = 0x08; +static const boost::uint16_t E100_FPGA_COMPAT_NUM = 0x09; static const boost::uint32_t E100_RX_SID_BASE = 2; static const boost::uint32_t E100_TX_ASYNC_SID = 1; static const double E100_DEFAULT_CLOCK_RATE = 64e6; diff --git a/host/lib/usrp/e100/io_impl.cpp b/host/lib/usrp/e100/io_impl.cpp index 441e32a8d..97f4db6f1 100644 --- a/host/lib/usrp/e100/io_impl.cpp +++ b/host/lib/usrp/e100/io_impl.cpp @@ -278,7 +278,7 @@ rx_streamer::sptr e100_impl::get_rx_stream(const uhd::stream_args_t &args_){ //setup defaults for unspecified values args.otw_format = args.otw_format.empty()? "sc16" : args.otw_format; args.channels = args.channels.empty()? std::vector<size_t>(1, 0) : args.channels; - const unsigned sc8_scalar = unsigned(args.args.cast<double>("scalar", 0x400)); + const unsigned sc8_scalar = unsigned(args.args.cast<double>("scalar", 1)); //calculate packet size static const size_t hdr_size = 0 |