Revision f5c62a46 host/lib/usrp/misc_utils.cpp

b/host/lib/usrp/misc_utils.cpp
164 164
            //empty db name means select dboard automatically
165 165
            if (pair.db_name.empty()){
166 166
                if (dboard_names.size() != 1) throw std::runtime_error(
167
                    "A daughterboard name must be provided for multi-slot boards: " + subdev_spec.to_string()
167
                    "A daughterboard name must be provided for multi-slot motherboards: " + subdev_spec.to_string()
168 168
                );
169 169
                pair.db_name == dboard_names.front();
170 170
            }
171 171
            uhd::assert_has(dboard_names, pair.db_name, xx_type + " dboard name");
172 172
            wax::obj dboard = mboard[named_prop_t(dboard_prop, pair.db_name)];
173
            uhd::assert_has(dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>(), pair.sd_name, xx_type + " subdev name");
173
            prop_names_t subdev_names = dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>();
174

  
175
            //empty sd name means select the subdev automatically
176
            if (pair.sd_name.empty()){
177
                if (subdev_names.size() != 1) throw std::runtime_error(
178
                    "A subdevice name must be provided for multi-subdev daughterboards: " + subdev_spec.to_string()
179
                );
180
                pair.sd_name == subdev_names.front();
181
            }
182
            uhd::assert_has(subdev_names, pair.sd_name, xx_type + " subdev name");
174 183
        }
175 184
    }catch(const std::exception &e){
176 185
        throw std::runtime_error(str(boost::format(

Also available in: Unified diff