diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-27 23:05:53 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-27 23:05:53 -0700 |
| commit | 3a6187515677b277489df4ec59f9cf21f1ed62bc (patch) | |
| tree | 0ff7e9b875886526c157d43174c2a8416d565be6 /host/lib/usrp | |
| parent | 0ad65e551369d3242e941489d90c8d527be7c7ce (diff) | |
| download | uhd-3a6187515677b277489df4ec59f9cf21f1ed62bc.tar.gz uhd-3a6187515677b277489df4ec59f9cf21f1ed62bc.tar.bz2 uhd-3a6187515677b277489df4ec59f9cf21f1ed62bc.zip | |
usrp2: restored discovery and most of io_impl
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_unknown.cpp | 8 |
3 files changed, 19 insertions, 3 deletions
diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt index 32ba79fbb..554da369e 100644 --- a/host/lib/usrp/CMakeLists.txt +++ b/host/lib/usrp/CMakeLists.txt @@ -36,7 +36,7 @@ LIBUHD_APPEND_SOURCES( INCLUDE_SUBDIRECTORY(cores) INCLUDE_SUBDIRECTORY(dboard) INCLUDE_SUBDIRECTORY(fx2) -INCLUDE_SUBDIRECTORY(usrp1) +#INCLUDE_SUBDIRECTORY(usrp1) #INCLUDE_SUBDIRECTORY(usrp2) -INCLUDE_SUBDIRECTORY(b100) -INCLUDE_SUBDIRECTORY(e100) +#INCLUDE_SUBDIRECTORY(b100) +#INCLUDE_SUBDIRECTORY(e100) diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index 566e24d97..05c989a97 100644 --- a/host/lib/usrp/dboard/db_basic_and_lf.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -162,6 +162,10 @@ void basic_rx::rx_get(const wax::obj &key_, wax::obj &val){ val = prop_names_t(1, ""); //vector of 1 empty string return; + case SUBDEV_PROP_SENSOR_NAMES: + val = prop_names_t(1, ""); //vector of 1 empty string + return; + case SUBDEV_PROP_CONNECTION: val = sd_name_to_conn[get_subdev_name()]; return; @@ -268,6 +272,10 @@ void basic_tx::tx_get(const wax::obj &key_, wax::obj &val){ val = prop_names_t(1, ""); //vector of 1 empty string return; + case SUBDEV_PROP_SENSOR_NAMES: + val = prop_names_t(1, ""); //vector of 1 empty string + return; + case SUBDEV_PROP_CONNECTION: val = sd_name_to_conn[get_subdev_name()]; return; diff --git a/host/lib/usrp/dboard/db_unknown.cpp b/host/lib/usrp/dboard/db_unknown.cpp index 6cacab231..19f0f1c71 100644 --- a/host/lib/usrp/dboard/db_unknown.cpp +++ b/host/lib/usrp/dboard/db_unknown.cpp @@ -142,6 +142,10 @@ void unknown_rx::rx_get(const wax::obj &key_, wax::obj &val){ val = prop_names_t(1, ""); //vector of 1 empty string return; + case SUBDEV_PROP_SENSOR_NAMES: + val = prop_names_t(1, ""); //vector of 1 empty string + return; + case SUBDEV_PROP_CONNECTION: val = SUBDEV_CONN_COMPLEX_IQ; return; @@ -238,6 +242,10 @@ void unknown_tx::tx_get(const wax::obj &key_, wax::obj &val){ val = prop_names_t(1, ""); //vector of 1 empty string return; + case SUBDEV_PROP_SENSOR_NAMES: + val = prop_names_t(1, ""); //vector of 1 empty string + return; + case SUBDEV_PROP_CONNECTION: val = SUBDEV_CONN_COMPLEX_IQ; return; |