Revision 1190bc5c

b/host/include/uhd/usrp/single_usrp.hpp
57 57
     */
58 58
    virtual device::sptr get_device(void) = 0;
59 59

  
60
    /*******************************************************************
61
     * Mboard methods
62
     ******************************************************************/
60 63
    /*!
61 64
     * Get a printable name for this usrp.
62 65
     * \return a printable string
63 66
     */
64 67
    virtual std::string get_pp_string(void) = 0;
65 68

  
66
    /*******************************************************************
67
     * Misc
68
     ******************************************************************/
69
    /*!
70
     * Get canonical name for this USRP motherboard.
71
     * \return a string representing the name
72
     */
73
    virtual std::string get_mboard_name(void) = 0;
74

  
69 75
    /*!
70 76
     * Gets the current time in the usrp time registers.
71 77
     * \return a timespec representing current usrp time
......
113 119
    virtual void set_rx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
114 120
    virtual uhd::usrp::subdev_spec_t get_rx_subdev_spec(void) = 0;
115 121

  
122
    virtual std::string get_rx_subdev_name(size_t chan = 0) = 0;
123

  
116 124
    virtual void set_rx_rate(double rate) = 0;
117 125
    virtual double get_rx_rate(void) = 0;
118 126

  
......
146 154
    virtual void set_tx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
147 155
    virtual uhd::usrp::subdev_spec_t get_tx_subdev_spec(void) = 0;
148 156

  
157
    virtual std::string get_tx_subdev_name(size_t chan = 0) = 0;
158

  
149 159
    virtual void set_tx_rate(double rate) = 0;
150 160
    virtual double get_tx_rate(void) = 0;
151 161

  
b/host/lib/usrp/single_usrp.cpp
54 54
        return _dev;
55 55
    }
56 56

  
57
    /*******************************************************************
58
     * Mboard methods
59
     ******************************************************************/
57 60
    std::string get_pp_string(void){
58 61
        std::string buff = str(boost::format(
59 62
            "Single USRP:\n"
......
101 104
        return buff;
102 105
    }
103 106

  
104
    /*******************************************************************
105
     * Misc
106
     ******************************************************************/
107
    std::string get_mboard_name(void){
108
        return _mboard()[MBOARD_PROP_NAME].as<std::string>();
109
    }
110

  
107 111
    time_spec_t get_time_now(void){
108 112
        return _mboard()[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
109 113
    }
......
135 139
        return _mboard()[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>();
136 140
    }
137 141

  
142
    std::string get_rx_subdev_name(size_t chan){
143
        return _rx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>();
144
    }
145

  
138 146
    void set_rx_rate(double rate){
139 147
        _rx_dsp()[DSP_PROP_HOST_RATE] = rate;
140 148
    }
......
206 214
        return _mboard()[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>();
207 215
    }
208 216

  
217
    std::string get_tx_subdev_name(size_t chan){
218
        return _tx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>();
219
    }
220

  
209 221
    void set_tx_rate(double rate){
210 222
        _tx_dsp()[DSP_PROP_HOST_RATE] = rate;
211 223
    }

Also available in: Unified diff