diff options
| author | Josh Blum <josh@joshknows.com> | 2011-08-18 10:11:57 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-08-18 10:11:57 -0700 |
| commit | 93aee136535aa77348d3b7f3520f066a4167126d (patch) | |
| tree | d0456ba32e274426ffcbde7861ea23bef83fa9d9 /host/lib/usrp/dboard | |
| parent | 8315ab86b172b21f24ecf84ce472bcaffe245f99 (diff) | |
| download | uhd-93aee136535aa77348d3b7f3520f066a4167126d.tar.gz uhd-93aee136535aa77348d3b7f3520f066a4167126d.tar.bz2 uhd-93aee136535aa77348d3b7f3520f066a4167126d.zip | |
usrp: dboard sensors fix, populate for tvrx, and should be empty on basics/unknown
Diffstat (limited to 'host/lib/usrp/dboard')
| -rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_tvrx.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_unknown.cpp | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index ff93f1d89..64d4a5bee 100644 --- a/host/lib/usrp/dboard/db_basic_and_lf.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -162,7 +162,7 @@ void basic_rx::rx_get(const wax::obj &key_, wax::obj &val){ return; case SUBDEV_PROP_SENSOR_NAMES: - val = prop_names_t(1, ""); //vector of 1 empty string + val = std::vector<std::string>(); //empty return; case SUBDEV_PROP_CONNECTION: @@ -272,7 +272,7 @@ void basic_tx::tx_get(const wax::obj &key_, wax::obj &val){ return; case SUBDEV_PROP_SENSOR_NAMES: - val = prop_names_t(1, ""); //vector of 1 empty string + val = std::vector<std::string>(); //empty return; case SUBDEV_PROP_CONNECTION: diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp index 3b8b276e0..907d798dd 100644 --- a/host/lib/usrp/dboard/db_tvrx.cpp +++ b/host/lib/usrp/dboard/db_tvrx.cpp @@ -463,6 +463,10 @@ void tvrx::rx_get(const wax::obj &key_, wax::obj &val){ val = 6.0e6; return; + case SUBDEV_PROP_SENSOR_NAMES: + val = std::vector<std::string>(); //empty + return; + default: UHD_THROW_PROP_GET_ERROR(); } } diff --git a/host/lib/usrp/dboard/db_unknown.cpp b/host/lib/usrp/dboard/db_unknown.cpp index 0587d015c..cd7ffe348 100644 --- a/host/lib/usrp/dboard/db_unknown.cpp +++ b/host/lib/usrp/dboard/db_unknown.cpp @@ -142,7 +142,7 @@ void unknown_rx::rx_get(const wax::obj &key_, wax::obj &val){ return; case SUBDEV_PROP_SENSOR_NAMES: - val = prop_names_t(1, ""); //vector of 1 empty string + val = std::vector<std::string>(); //empty return; case SUBDEV_PROP_CONNECTION: @@ -242,7 +242,7 @@ void unknown_tx::tx_get(const wax::obj &key_, wax::obj &val){ return; case SUBDEV_PROP_SENSOR_NAMES: - val = prop_names_t(1, ""); //vector of 1 empty string + val = std::vector<std::string>(); //empty return; case SUBDEV_PROP_CONNECTION: |