Revision 15268898 host/lib/usrp/dboard/db_dbsrx2.cpp

b/host/lib/usrp/dboard/db_dbsrx2.cpp
79 79
    void set_bandwidth(double bandwidth);
80 80

  
81 81
    void send_reg(boost::uint8_t start_reg, boost::uint8_t stop_reg){
82
        start_reg = boost::uint8_t(std::clip(int(start_reg), 0x0, 0xB));
83
        stop_reg = boost::uint8_t(std::clip(int(stop_reg), 0x0, 0xB));
82
        start_reg = boost::uint8_t(uhd::clip(int(start_reg), 0x0, 0xB));
83
        stop_reg = boost::uint8_t(uhd::clip(int(stop_reg), 0x0, 0xB));
84 84

  
85 85
        for(boost::uint8_t start_addr=start_reg; start_addr <= stop_reg; start_addr += sizeof(boost::uint32_t) - 1){
86 86
            int num_bytes = int(stop_reg - start_addr + 1) > int(sizeof(boost::uint32_t)) - 1 ? sizeof(boost::uint32_t) - 1 : stop_reg - start_addr + 1;
......
108 108

  
109 109
    void read_reg(boost::uint8_t start_reg, boost::uint8_t stop_reg){
110 110
        static const boost::uint8_t status_addr = 0xC;
111
        start_reg = boost::uint8_t(std::clip(int(start_reg), 0x0, 0xD));
112
        stop_reg = boost::uint8_t(std::clip(int(stop_reg), 0x0, 0xD));
111
        start_reg = boost::uint8_t(uhd::clip(int(start_reg), 0x0, 0xD));
112
        stop_reg = boost::uint8_t(uhd::clip(int(stop_reg), 0x0, 0xD));
113 113

  
114 114
        for(boost::uint8_t start_addr=start_reg; start_addr <= stop_reg; start_addr += sizeof(boost::uint32_t)){
115 115
            int num_bytes = int(stop_reg - start_addr + 1) > int(sizeof(boost::uint32_t)) ? sizeof(boost::uint32_t) : stop_reg - start_addr + 1;
......
216 216
 * Tuning
217 217
 **********************************************************************/
218 218
void dbsrx2::set_lo_freq(double target_freq){
219
    //target_freq = std::clip(target_freq, dbsrx2_freq_range.min, dbsrx2_freq_range.max);
219
    //target_freq = uhd::clip(target_freq, dbsrx2_freq_range.min, dbsrx2_freq_range.max);
220 220

  
221 221
    //variables used in the calculation below
222 222
    int scaler = target_freq > 1125e6 ? 2 : 4;
......
330 330
 **********************************************************************/
331 331
void dbsrx2::set_bandwidth(double bandwidth){
332 332
    //clip the input
333
    bandwidth = std::clip<double>(bandwidth, 4e6, 40e6);
333
    bandwidth = uhd::clip<double>(bandwidth, 4e6, 40e6);
334 334

  
335 335
    _max2112_write_regs.lp = int((bandwidth/1e6 - 4)/0.29 + 12);
336 336
    _bandwidth = double(4 + (_max2112_write_regs.lp - 12) * 0.29)*1e6;

Also available in: Unified diff