Revision 988cba70

b/host/lib/usrp/dboard/db_basic_and_lf.cpp
57 57
    double _max_freq;
58 58
};
59 59

  
60
static const uhd::dict<std::string, subdev_conn_t> sd_name_to_conn = map_list_of
61
    ("AB", SUBDEV_CONN_COMPLEX_IQ)
62
    ("A",  SUBDEV_CONN_REAL_I)
63
    ("B",  SUBDEV_CONN_REAL_Q)
64
;
65

  
60 66
/***********************************************************************
61 67
 * Register the basic and LF dboards
62 68
 **********************************************************************/
......
77 83
}
78 84

  
79 85
UHD_STATIC_BLOCK(reg_basic_and_lf_dboards){
80
    dboard_manager::register_dboard(0x0000, &make_basic_tx, "Basic TX");
81
    dboard_manager::register_dboard(0x0001, &make_basic_rx, "Basic RX", list_of("AB")("A")("B"));
82
    dboard_manager::register_dboard(0x000e, &make_lf_tx,    "LF TX");
83
    dboard_manager::register_dboard(0x000f, &make_lf_rx,    "LF RX",    list_of("AB")("A")("B"));
86
    dboard_manager::register_dboard(0x0000, &make_basic_tx, "Basic TX", sd_name_to_conn.keys());
87
    dboard_manager::register_dboard(0x0001, &make_basic_rx, "Basic RX", sd_name_to_conn.keys());
88
    dboard_manager::register_dboard(0x000e, &make_lf_tx,    "LF TX",    sd_name_to_conn.keys());
89
    dboard_manager::register_dboard(0x000f, &make_lf_rx,    "LF RX",    sd_name_to_conn.keys());
84 90
}
85 91

  
86 92
/***********************************************************************
......
138 144
        val = prop_names_t(1, ""); //vector of 1 empty string
139 145
        return;
140 146

  
141
    case SUBDEV_PROP_CONNECTION:{
142
            static const uhd::dict<std::string, subdev_conn_t> name_to_conn = map_list_of
143
                ("A",  SUBDEV_CONN_REAL_I)
144
                ("B",  SUBDEV_CONN_REAL_Q)
145
                ("AB", SUBDEV_CONN_COMPLEX_IQ)
146
            ;
147
            val = name_to_conn[get_subdev_name()];
148
        } return;
147
    case SUBDEV_PROP_CONNECTION:
148
        val = sd_name_to_conn[get_subdev_name()];
149
        return;
149 150

  
150 151
    case SUBDEV_PROP_USE_LO_OFFSET:
151 152
        val = false;
......
197 198
    //handle the get request conditioned on the key
198 199
    switch(key.as<subdev_prop_t>()){
199 200
    case SUBDEV_PROP_NAME:
200
        val = get_tx_id().to_pp_string();
201
        val = std::string(str(boost::format("%s - %s")
202
            % get_tx_id().to_pp_string()
203
            % get_subdev_name()
204
        ));
201 205
        return;
202 206

  
203 207
    case SUBDEV_PROP_OTHERS:
......
233 237
        return;
234 238

  
235 239
    case SUBDEV_PROP_CONNECTION:
236
        val = SUBDEV_CONN_COMPLEX_IQ;
240
        val = sd_name_to_conn[get_subdev_name()];
237 241
        return;
238 242

  
239 243
    case SUBDEV_PROP_USE_LO_OFFSET:

Also available in: Unified diff