summaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-07-16 16:43:06 -0700
committerJosh Blum <josh@joshknows.com>2010-07-16 16:51:30 -0700
commit9a9ca6dfad4b81c42f3cda6a44b018358999d701 (patch)
tree8e14ee690aa0fb13db9581415492ef889e73e656 /host/include
parent2a3d0e653e9d38dc3eed729d1442f3d98aadb1e5 (diff)
downloaduhd-9a9ca6dfad4b81c42f3cda6a44b018358999d701.tar.gz
uhd-9a9ca6dfad4b81c42f3cda6a44b018358999d701.tar.bz2
uhd-9a9ca6dfad4b81c42f3cda6a44b018358999d701.zip
uhd: work on tune logic, and subdev connection logic
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/usrp/subdev_props.hpp21
1 files changed, 19 insertions, 2 deletions
diff --git a/host/include/uhd/usrp/subdev_props.hpp b/host/include/uhd/usrp/subdev_props.hpp
index cb7027ff1..f7bdcd161 100644
--- a/host/include/uhd/usrp/subdev_props.hpp
+++ b/host/include/uhd/usrp/subdev_props.hpp
@@ -23,6 +23,22 @@
namespace uhd{ namespace usrp{
/*!
+ * Possible subdev connection types:
+ *
+ * A complex subdevice is physically connected to both channels,
+ * which may be connected in one of two ways: IQ or QI (swapped).
+ *
+ * A real subdevice is only physically connected one channel,
+ * either only the I channel or only the Q channel.
+ */
+ enum subdev_conn_t{
+ SUBDEV_CONN_COMPLEX_IQ = 'C',
+ SUBDEV_CONN_COMPLEX_QI = 'c',
+ SUBDEV_CONN_REAL_I = 'R',
+ SUBDEV_CONN_REAL_Q = 'r'
+ };
+
+ /*!
* Possible device subdev properties
*/
enum subdev_prop_t{
@@ -36,8 +52,9 @@ namespace uhd{ namespace usrp{
SUBDEV_PROP_ANTENNA = 'a', //rw, std::string
SUBDEV_PROP_ANTENNA_NAMES = 'A', //ro, prop_names_t
SUBDEV_PROP_LO_LOCKED = 'L', //ro, bool
- SUBDEV_PROP_QUADRATURE = 'q', //ro, bool
- SUBDEV_PROP_IQ_SWAPPED = 'i', //ro, bool
+ SUBDEV_PROP_CONNECTION = 'c', //ro, subdev_conn_t
+ //SUBDEV_PROP_QUADRATURE = 'q', //ro, bool
+ //SUBDEV_PROP_IQ_SWAPPED = 'i', //ro, bool
SUBDEV_PROP_USE_LO_OFFSET = 'l', //ro, bool
SUBDEV_PROP_RSSI = 'R', //ro, float
SUBDEV_PROP_BANDWIDTH = 'B' //rw, double