diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-07-17 18:44:48 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-07-17 18:44:48 -0700 |
| commit | 3d5176874f90f9155c1591656df8a7d663b3c712 (patch) | |
| tree | 3693c123057a9420b273f595e6609fb32343130c /host/lib/usrp/dboard/db_sbx_common.cpp | |
| parent | 47c853f9dd518ef25d23b94bc0e77dbda3c2ddab (diff) | |
| parent | 684fd3a3ffaf31b9fa726ccf2fdea2627f6ea10d (diff) | |
| download | uhd-3d5176874f90f9155c1591656df8a7d663b3c712.tar.gz uhd-3d5176874f90f9155c1591656df8a7d663b3c712.tar.bz2 uhd-3d5176874f90f9155c1591656df8a7d663b3c712.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/dboard/db_sbx_common.cpp')
| -rw-r--r-- | host/lib/usrp/dboard/db_sbx_common.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/host/lib/usrp/dboard/db_sbx_common.cpp b/host/lib/usrp/dboard/db_sbx_common.cpp index 8df4028e7..42c080155 100644 --- a/host/lib/usrp/dboard/db_sbx_common.cpp +++ b/host/lib/usrp/dboard/db_sbx_common.cpp @@ -118,27 +118,24 @@ sbx_xcvr::sbx_xcvr(ctor_args_t args) : xcvr_dboard_base(args){ switch(get_rx_id().to_uint16()) { case 0x0054: db_actual = sbx_versionx_sptr(new sbx_version3(this)); - freq_range = sbx_freq_range; + freq_range = sbx_freq_range; + enable_rx_lo_filter = sbx_enable_rx_lo_filter; + enable_tx_lo_filter = sbx_enable_tx_lo_filter; break; case 0x0065: - db_actual = sbx_versionx_sptr(new sbx_version4(this)); - freq_range = sbx_freq_range; - break; - case 0x0067: - db_actual = sbx_versionx_sptr(new cbx(this)); - freq_range = cbx_freq_range; - break; case 0x0069: - db_actual = sbx_versionx_sptr(new sbx_version4(this)); - freq_range = sbx_freq_range; - break; case 0x0083: db_actual = sbx_versionx_sptr(new sbx_version4(this)); - freq_range = sbx_freq_range; + freq_range = sbx_freq_range; + enable_rx_lo_filter = sbx_enable_rx_lo_filter; + enable_tx_lo_filter = sbx_enable_tx_lo_filter; break; + case 0x0067: case 0x0085: db_actual = sbx_versionx_sptr(new cbx(this)); - freq_range = cbx_freq_range; + freq_range = cbx_freq_range; + enable_rx_lo_filter = cbx_enable_rx_lo_filter; + enable_tx_lo_filter = cbx_enable_tx_lo_filter; break; default: /* We didn't recognize the version of the board... */ @@ -256,8 +253,8 @@ void sbx_xcvr::update_atr(void){ //calculate atr pins int rx_pga0_iobits = rx_pga0_gain_to_iobits(_rx_gains["PGA0"]); int tx_pga0_iobits = tx_pga0_gain_to_iobits(_tx_gains["PGA0"]); - int rx_lo_lpf_en = (_rx_lo_freq == sbx_enable_rx_lo_filter.clip(_rx_lo_freq)) ? LO_LPF_EN : 0; - int tx_lo_lpf_en = (_tx_lo_freq == sbx_enable_tx_lo_filter.clip(_tx_lo_freq)) ? LO_LPF_EN : 0; + int rx_lo_lpf_en = (_rx_lo_freq == enable_rx_lo_filter.clip(_rx_lo_freq)) ? LO_LPF_EN : 0; + int tx_lo_lpf_en = (_tx_lo_freq == enable_tx_lo_filter.clip(_tx_lo_freq)) ? LO_LPF_EN : 0; int rx_ld_led = _rx_lo_lock_cache ? 0 : RX_LED_LD; int tx_ld_led = _tx_lo_lock_cache ? 0 : TX_LED_LD; int rx_ant_led = _rx_ant == "TX/RX" ? RX_LED_RX1RX2 : 0; |