Revision 51a9c2d4 host/lib/usrp/usrp2/dboard_impl.cpp

b/host/lib/usrp/usrp2/dboard_impl.cpp
22 22
#include <uhd/usrp/dboard_props.hpp>
23 23
#include <uhd/utils/assert.hpp>
24 24
#include <boost/format.hpp>
25
#include <boost/bind.hpp>
26
#include <boost/asio.hpp> //htonl and ntohl
25 27
#include <iostream>
26 28

  
27 29
using namespace uhd;
......
34 36
    //grab the dboard ids over the control line
35 37
    usrp2_ctrl_data_t out_data;
36 38
    out_data.id = htonl(USRP2_CTRL_ID_GIVE_ME_YOUR_DBOARD_IDS_BRO);
37
    usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data);
39
    usrp2_ctrl_data_t in_data = _iface->ctrl_send_and_recv(out_data);
38 40
    ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_THESE_ARE_MY_DBOARD_IDS_DUDE);
39 41

  
40 42
    //extract the dboard ids an convert them
......
43 45

  
44 46
    //create a new dboard interface and manager
45 47
    dboard_interface::sptr _dboard_interface(
46
        make_usrp2_dboard_interface(this)
48
        make_usrp2_dboard_iface(_iface, _clk_ctrl)
47 49
    );
48 50
    _dboard_manager = dboard_manager::make(
49 51
        rx_dboard_id, tx_dboard_id, _dboard_interface
......
82 84
        rx_mux = (((rx_mux >> 0) & 0x3) << 2) | (((rx_mux >> 2) & 0x3) << 0);
83 85
    }
84 86

  
85
    this->poke32(FR_DSP_RX_MUX, rx_mux);
87
    _iface->poke32(FR_DSP_RX_MUX, rx_mux);
86 88
}
87 89

  
88 90
void usrp2_impl::update_tx_mux_config(void){
......
95 97
        tx_mux = (((tx_mux >> 0) & 0x1) << 1) | (((tx_mux >> 1) & 0x1) << 0);
96 98
    }
97 99

  
98
    this->poke32(FR_DSP_TX_MUX, tx_mux);
100
    _iface->poke32(FR_DSP_TX_MUX, tx_mux);
99 101
}
100 102

  
101 103
/***********************************************************************

Also available in: Unified diff