diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-20 18:40:36 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-20 18:40:36 -0700 |
| commit | c2ec8c143e569df115401fdf92483fab421ade2d (patch) | |
| tree | c15d7f191cf0570b516bf25ae828de63dc0903ad | |
| parent | 318d62a179806cec20b5adb4f2aad58ecc5a330e (diff) | |
| download | uhd-c2ec8c143e569df115401fdf92483fab421ade2d.tar.gz uhd-c2ec8c143e569df115401fdf92483fab421ade2d.tar.bz2 uhd-c2ec8c143e569df115401fdf92483fab421ade2d.zip | |
usrp: use a dash as the gain name prefix separator, removed RX/TX auto suffix for XCVR board cnames
| -rw-r--r-- | host/lib/usrp/dboard_manager.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/misc_utils.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp index d7e7943c4..d73a698ae 100644 --- a/host/lib/usrp/dboard_manager.cpp +++ b/host/lib/usrp/dboard_manager.cpp @@ -69,8 +69,8 @@ void dboard_manager::register_dboard( const prop_names_t &subdev_names ){ //regular registration for ids - register_dboard(rx_dboard_id, dboard_ctor, name + " RX", subdev_names); - register_dboard(tx_dboard_id, dboard_ctor, name + " TX", subdev_names); + register_dboard(rx_dboard_id, dboard_ctor, name, subdev_names); + register_dboard(tx_dboard_id, dboard_ctor, name, subdev_names); //register xcvr mapping for ids get_xcvr_id_to_id_map()[rx_dboard_id] = tx_dboard_id; diff --git a/host/lib/usrp/misc_utils.cpp b/host/lib/usrp/misc_utils.cpp index e95af45bd..7e49baa52 100644 --- a/host/lib/usrp/misc_utils.cpp +++ b/host/lib/usrp/misc_utils.cpp @@ -88,8 +88,8 @@ gain_group::sptr usrp::make_gain_group( const size_t codec_gain_priority = (gain_group_policy == GAIN_GROUP_POLICY_RX)? (subdev_gain_priority - 1): //RX policy, codec gains fill last (lower priority) (subdev_gain_priority + 1); //TX policy, codec gains fill first (higher priority) - const std::string subdev_prefix = dboard_id.to_cname() + " "; - const std::string codec_prefix = (gain_group_policy == GAIN_GROUP_POLICY_RX)? "ADC " : "DAC "; + const std::string subdev_prefix = dboard_id.to_cname() + "-"; + const std::string codec_prefix = (gain_group_policy == GAIN_GROUP_POLICY_RX)? "ADC-" : "DAC-"; gain_group::sptr gg = gain_group::make(); gain_fcns_t fcns; |