summaryrefslogtreecommitdiffstats
path: root/host/lib/device.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-27 15:20:53 -0700
committerJosh Blum <josh@joshknows.com>2010-04-27 15:20:53 -0700
commit04dae4bf6b11b5aad383f95be6a77863a7c2f6ec (patch)
tree5d6bc7d4c22623a8917481da77630688e8ad67bb /host/lib/device.cpp
parentb920557788fc5435915584bec6ab16a97d7c6090 (diff)
downloaduhd-04dae4bf6b11b5aad383f95be6a77863a7c2f6ec.tar.gz
uhd-04dae4bf6b11b5aad383f95be6a77863a7c2f6ec.tar.bz2
uhd-04dae4bf6b11b5aad383f95be6a77863a7c2f6ec.zip
setting size of buffers from device args
Diffstat (limited to 'host/lib/device.cpp')
-rw-r--r--host/lib/device.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index 706f64951..88bd2cff4 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -97,11 +97,6 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
BOOST_FOREACH(const dev_fcn_reg_t &fcn, get_dev_fcn_regs()){
BOOST_FOREACH(device_addr_t dev_addr, fcn.get<0>()(hint)){
- //copy keys that were in hint but not in dev_addr
- //this way, we can pass additional transport arguments
- BOOST_FOREACH(const std::string &key, hint.keys()){
- if (not dev_addr.has_key(key)) dev_addr[key] = hint[key];
- }
//append the discovered address and its factory function
dev_addr_makers.push_back(dev_addr_make_t(dev_addr, fcn.get<1>()));
}
@@ -127,6 +122,12 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
size_t dev_hash = hash_device_addr(dev_addr);
//std::cout << boost::format("Hash: %u") % dev_hash << std::endl;
+ //copy keys that were in hint but not in dev_addr
+ //this way, we can pass additional transport arguments
+ BOOST_FOREACH(const std::string &key, hint.keys()){
+ if (not dev_addr.has_key(key)) dev_addr[key] = hint[key];
+ }
+
//map device address hash to created devices
static uhd::dict<size_t, boost::weak_ptr<device> > hash_to_device;