diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-18 12:56:06 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-18 12:56:06 -0700 |
| commit | 0fb4451675947f8f965831f0a5f4e93945e93b90 (patch) | |
| tree | 79f1dc97ad40bcc92bd11ee216065458d5298bd9 /host/lib/usrp/dboard/db_wbx_simple.cpp | |
| parent | 0e788f77514cf33b0ff178bc7e72287d9e086ba2 (diff) | |
| parent | 60edbd7f59c873ce69ddb5b337e640f479a28321 (diff) | |
| download | uhd-0fb4451675947f8f965831f0a5f4e93945e93b90.tar.gz uhd-0fb4451675947f8f965831f0a5f4e93945e93b90.tar.bz2 uhd-0fb4451675947f8f965831f0a5f4e93945e93b90.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/convert/convert_fc64_with_sse2.cpp
Diffstat (limited to 'host/lib/usrp/dboard/db_wbx_simple.cpp')
| -rw-r--r-- | host/lib/usrp/dboard/db_wbx_simple.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/host/lib/usrp/dboard/db_wbx_simple.cpp b/host/lib/usrp/dboard/db_wbx_simple.cpp index ae466b08a..990bacbc8 100644 --- a/host/lib/usrp/dboard/db_wbx_simple.cpp +++ b/host/lib/usrp/dboard/db_wbx_simple.cpp @@ -16,7 +16,7 @@ // // Antenna constants -#define ANTSW_IO ((1 << 5)|(1 << 15)) // on UNIT_TX, 0 = TX, 1 = RX, on UNIT_RX 0 = main ant, 1 = RX2 +#define ANTSW_IO ((1 << 15)) // on UNIT_TX, 0 = TX, 1 = RX, on UNIT_RX 0 = main ant, 1 = RX2 #define ANT_TX 0 //the tx line is transmitting #define ANT_RX ANTSW_IO //the tx line is receiving #define ANT_TXRX 0 //the rx line is on txrx @@ -149,7 +149,10 @@ void wbx_simple::rx_get(const wax::obj &key_, wax::obj &val){ //handle the get request conditioned on the key switch(key.as<subdev_prop_t>()){ case SUBDEV_PROP_NAME: - val = std::string("WBX RX + Simple GDB"); + if (is_v3()) + val = std::string("WBX v3 RX + Simple GDB"); + else + val = std::string("WBX RX + Simple GDB"); return; case SUBDEV_PROP_FREQ: @@ -203,7 +206,10 @@ void wbx_simple::tx_get(const wax::obj &key_, wax::obj &val){ //handle the get request conditioned on the key switch(key.as<subdev_prop_t>()){ case SUBDEV_PROP_NAME: - val = std::string("WBX TX + Simple GDB"); + if (is_v3()) + val = std::string("WBX v3 TX + Simple GDB"); + else + val = std::string("WBX TX + Simple GDB"); return; case SUBDEV_PROP_FREQ: |