diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-03-14 11:18:48 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-03-14 11:18:48 -0700 |
| commit | 79e038bc8691d838891377cf6b6123b1ab57a4ca (patch) | |
| tree | e4a622025d5249aaa00bcb6a2ee76b18de396ec8 /host/lib/usrp/b200/b200_impl.cpp | |
| parent | 012e71cad30c663b186a903dc5c48018f544a507 (diff) | |
| parent | fd1e2f8fc1b481b1f0c80798172a601a507914f3 (diff) | |
| download | uhd-79e038bc8691d838891377cf6b6123b1ab57a4ca.tar.gz uhd-79e038bc8691d838891377cf6b6123b1ab57a4ca.tar.bz2 uhd-79e038bc8691d838891377cf6b6123b1ab57a4ca.zip | |
Merging fixes for subdev specs in B2xx.
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 74e61143b..66df1f3bc 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2012-2013 Ettus Research LLC +// Copyright 2012-2014 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 @@ -373,12 +373,15 @@ b200_impl::b200_impl(const device_addr_t &device_addr) //////////////////////////////////////////////////////////////////// // create frontend mapping //////////////////////////////////////////////////////////////////// + std::vector<size_t> default_map(2, 0); default_map[1] = 1; // Set this to A->0 B->1 even if there's only A + _tree->create<std::vector<size_t> >(mb_path / "rx_chan_dsp_mapping").set(default_map); + _tree->create<std::vector<size_t> >(mb_path / "tx_chan_dsp_mapping").set(default_map); _tree->create<subdev_spec_t>(mb_path / "rx_subdev_spec") .set(subdev_spec_t()) - .subscribe(boost::bind(&b200_impl::update_rx_subdev_spec, this, _1)); + .subscribe(boost::bind(&b200_impl::update_subdev_spec, this, "rx", _1)); _tree->create<subdev_spec_t>(mb_path / "tx_subdev_spec") .set(subdev_spec_t()) - .subscribe(boost::bind(&b200_impl::update_tx_subdev_spec, this, _1)); + .subscribe(boost::bind(&b200_impl::update_subdev_spec, this, "tx", _1)); //////////////////////////////////////////////////////////////////// // setup radio control |