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/usrp2 | |
| 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/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index 1af1db860..0babf7445 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -30,9 +30,9 @@ extern "C" { #endif //fpga and firmware compatibility numbers -#define USRP2_FPGA_COMPAT_NUM 8 +#define USRP2_FPGA_COMPAT_NUM 9 #define USRP2_FW_COMPAT_NUM 11 -#define USRP2_FW_VER_MINOR 1 +#define USRP2_FW_VER_MINOR 2 //used to differentiate control packets over data port #define USRP2_INVALID_VRT_HEADER 0 diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index e3fa46920..5f5369f7d 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -380,7 +380,7 @@ rx_streamer::sptr usrp2_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 |