diff options
Diffstat (limited to 'host/lib/usrp/e100')
| -rw-r--r-- | host/lib/usrp/e100/dboard_iface.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/e100/e100_ctrl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/e100/io_impl.cpp | 3 | 
3 files changed, 9 insertions, 6 deletions
diff --git a/host/lib/usrp/e100/dboard_iface.cpp b/host/lib/usrp/e100/dboard_iface.cpp index 532b2dc9e..07d0049c8 100644 --- a/host/lib/usrp/e100/dboard_iface.cpp +++ b/host/lib/usrp/e100/dboard_iface.cpp @@ -73,8 +73,8 @@ public:      void set_gpio_debug(unit_t, int);      boost::uint16_t read_gpio(unit_t); -    void write_i2c(boost::uint8_t, const byte_vector_t &); -    byte_vector_t read_i2c(boost::uint8_t, size_t); +    void write_i2c(boost::uint16_t, const byte_vector_t &); +    byte_vector_t read_i2c(boost::uint16_t, size_t);      void write_spi(          unit_t unit, @@ -219,11 +219,11 @@ boost::uint32_t e100_dboard_iface::read_write_spi(  /***********************************************************************   * I2C   **********************************************************************/ -void e100_dboard_iface::write_i2c(boost::uint8_t addr, const byte_vector_t &bytes){ +void e100_dboard_iface::write_i2c(boost::uint16_t addr, const byte_vector_t &bytes){      return _i2c_iface->write_i2c(addr, bytes);  } -byte_vector_t e100_dboard_iface::read_i2c(boost::uint8_t addr, size_t num_bytes){ +byte_vector_t e100_dboard_iface::read_i2c(boost::uint16_t addr, size_t num_bytes){      return _i2c_iface->read_i2c(addr, num_bytes);  } diff --git a/host/lib/usrp/e100/e100_ctrl.cpp b/host/lib/usrp/e100/e100_ctrl.cpp index c9c86c8af..cdbbff6dd 100644 --- a/host/lib/usrp/e100/e100_ctrl.cpp +++ b/host/lib/usrp/e100/e100_ctrl.cpp @@ -144,7 +144,7 @@ public:          ::close(_node_fd);      } -    void write_i2c(boost::uint8_t addr, const byte_vector_t &bytes){ +    void write_i2c(boost::uint16_t addr, const byte_vector_t &bytes){          byte_vector_t rw_bytes(bytes);          //setup the message @@ -163,7 +163,7 @@ public:          UHD_ASSERT_THROW(::ioctl(_node_fd, I2C_RDWR, &data) >= 0);      } -    byte_vector_t read_i2c(boost::uint8_t addr, size_t num_bytes){ +    byte_vector_t read_i2c(boost::uint16_t addr, size_t num_bytes){          byte_vector_t bytes(num_bytes);          //setup the message diff --git a/host/lib/usrp/e100/io_impl.cpp b/host/lib/usrp/e100/io_impl.cpp index e34620444..bf04a5871 100644 --- a/host/lib/usrp/e100/io_impl.cpp +++ b/host/lib/usrp/e100/io_impl.cpp @@ -166,6 +166,8 @@ rx_streamer::sptr e100_impl::get_rx_stream(const uhd::stream_args_t &args_){          my_streamer->set_overflow_handler(chan_i, boost::bind(              &rx_dsp_core_200::handle_overflow, _rx_dsps[dsp]          )); +        my_streamer->set_issue_stream_cmd(chan_i, boost::bind( +            &rx_dsp_core_200::issue_stream_command, _rx_dsps[dsp], _1));          _rx_streamers[dsp] = my_streamer; //store weak pointer      } @@ -220,6 +222,7 @@ tx_streamer::sptr e100_impl::get_tx_stream(const uhd::stream_args_t &args_){          my_streamer->set_xport_chan_get_buff(chan_i, boost::bind(              &zero_copy_if::get_send_buff, _data_transport, _1          )); +        my_streamer->set_async_receiver(boost::bind(&fifo_ctrl_excelsior::pop_async_msg, _fifo_ctrl, _1, _2));          _tx_streamers[dsp] = my_streamer; //store weak pointer      }  | 
