diff options
| -rw-r--r-- | host/include/uhd/usrp/dboard_interface.hpp | 6 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp (renamed from host/lib/usrp/dboard/basic.cpp) | 4 | ||||
| -rw-r--r-- | host/lib/usrp/dboard_manager.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_interface.cpp | 12 |
5 files changed, 15 insertions, 17 deletions
diff --git a/host/include/uhd/usrp/dboard_interface.hpp b/host/include/uhd/usrp/dboard_interface.hpp index 5b40616f0..c779431ab 100644 --- a/host/include/uhd/usrp/dboard_interface.hpp +++ b/host/include/uhd/usrp/dboard_interface.hpp @@ -104,18 +104,16 @@ public: * * \param bank GPIO_TX_BANK or GPIO_RX_BANK * \param value 16-bits, 0=FPGA input, 1=FPGA output - * \param mask 16-bits, 0=ignore, 1=set */ - virtual void set_gpio_ddr(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask) = 0; + virtual void set_gpio_ddr(gpio_bank_t bank, boost::uint16_t value) = 0; /*! * Set daughterboard GPIO pin values. * * \param bank GPIO_TX_BANK or GPIO_RX_BANK * \param value 16 bits, 0=low, 1=high - * \param mask 16 bits, 0=ignore, 1=set */ - virtual void write_gpio(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask) = 0; + virtual void write_gpio(gpio_bank_t bank, boost::uint16_t value) = 0; /*! * Read daughterboard GPIO pin values diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 55034c780..b205bad5b 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -29,7 +29,7 @@ SET(libuhd_sources transport/if_addrs.cpp transport/udp_simple.cpp transport/vrt.cpp - usrp/dboard/basic.cpp + usrp/dboard/db_basic_and_lf.cpp usrp/dboard_base.cpp usrp/dboard_interface.cpp usrp/dboard_manager.cpp diff --git a/host/lib/usrp/dboard/basic.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index 2f29c8e0c..50c868a24 100644 --- a/host/lib/usrp/dboard/basic.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -88,7 +88,7 @@ UHD_STATIC_BLOCK(reg_dboards){ basic_rx::basic_rx(ctor_args_t const& args, double max_freq) : rx_dboard_base(args){ _max_freq = max_freq; // set the gpios to safe values (all inputs) - get_interface()->set_gpio_ddr(dboard_interface::GPIO_RX_BANK, 0x0000, 0xffff); + get_interface()->set_gpio_ddr(dboard_interface::GPIO_RX_BANK, 0x0000); } basic_rx::~basic_rx(void){ @@ -199,7 +199,7 @@ void basic_rx::rx_set(const wax::obj &key_, const wax::obj &val){ basic_tx::basic_tx(ctor_args_t const& args, double max_freq) : tx_dboard_base(args){ _max_freq = max_freq; // set the gpios to safe values (all inputs) - get_interface()->set_gpio_ddr(dboard_interface::GPIO_TX_BANK, 0x0000, 0xffff); + get_interface()->set_gpio_ddr(dboard_interface::GPIO_TX_BANK, 0x0000); } basic_tx::~basic_tx(void){ diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp index 424626023..15be7eedc 100644 --- a/host/lib/usrp/dboard_manager.cpp +++ b/host/lib/usrp/dboard_manager.cpp @@ -275,11 +275,11 @@ wax::obj dboard_manager_impl::get_tx_subdev(const std::string &subdev_name){ void dboard_manager_impl::set_nice_gpio_pins(void){ //std::cout << "Set nice GPIO pins" << std::endl; - _interface->set_gpio_ddr(dboard_interface::GPIO_RX_BANK, 0x0000, 0xffff); //all inputs - _interface->set_gpio_ddr(dboard_interface::GPIO_TX_BANK, 0x0000, 0xffff); + _interface->set_gpio_ddr(dboard_interface::GPIO_RX_BANK, 0x0000); //all inputs + _interface->set_gpio_ddr(dboard_interface::GPIO_TX_BANK, 0x0000); - _interface->write_gpio(dboard_interface::GPIO_RX_BANK, 0x0000, 0xffff); //all zeros - _interface->write_gpio(dboard_interface::GPIO_TX_BANK, 0x0000, 0xffff); + _interface->write_gpio(dboard_interface::GPIO_RX_BANK, 0x0000); //all zeros + _interface->write_gpio(dboard_interface::GPIO_TX_BANK, 0x0000); _interface->set_atr_reg(dboard_interface::GPIO_RX_BANK, 0x0000, 0x0000, 0x0000); //software controlled _interface->set_atr_reg(dboard_interface::GPIO_TX_BANK, 0x0000, 0x0000, 0x0000); diff --git a/host/lib/usrp/usrp2/dboard_interface.cpp b/host/lib/usrp/usrp2/dboard_interface.cpp index 8fc7864b0..5a7d870b4 100644 --- a/host/lib/usrp/usrp2/dboard_interface.cpp +++ b/host/lib/usrp/usrp2/dboard_interface.cpp @@ -29,8 +29,8 @@ public: int read_aux_adc(unit_type_t, int); void set_atr_reg(gpio_bank_t, boost::uint16_t, boost::uint16_t, boost::uint16_t); - void set_gpio_ddr(gpio_bank_t, boost::uint16_t, boost::uint16_t); - void write_gpio(gpio_bank_t, boost::uint16_t, boost::uint16_t); + void set_gpio_ddr(gpio_bank_t, boost::uint16_t); + void write_gpio(gpio_bank_t, boost::uint16_t); boost::uint16_t read_gpio(gpio_bank_t); void write_i2c(int, const byte_vector_t &); @@ -97,26 +97,26 @@ static boost::uint8_t gpio_bank_to_otw(dboard_interface::gpio_bank_t bank){ throw std::invalid_argument("unknown gpio bank type"); } -void usrp2_dboard_interface::set_gpio_ddr(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask){ +void usrp2_dboard_interface::set_gpio_ddr(gpio_bank_t bank, boost::uint16_t value){ //setup the out data usrp2_ctrl_data_t out_data; out_data.id = htonl(USRP2_CTRL_ID_USE_THESE_GPIO_DDR_SETTINGS_BRO); out_data.data.gpio_config.bank = gpio_bank_to_otw(bank); out_data.data.gpio_config.value = htons(value); - out_data.data.gpio_config.mask = htons(mask); + out_data.data.gpio_config.mask = htons(0xffff); //send and recv usrp2_ctrl_data_t in_data = _impl->ctrl_send_and_recv(out_data); ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_GOT_THE_GPIO_DDR_SETTINGS_DUDE); } -void usrp2_dboard_interface::write_gpio(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask){ +void usrp2_dboard_interface::write_gpio(gpio_bank_t bank, boost::uint16_t value){ //setup the out data usrp2_ctrl_data_t out_data; out_data.id = htonl(USRP2_CTRL_ID_SET_YOUR_GPIO_PIN_OUTS_BRO); out_data.data.gpio_config.bank = gpio_bank_to_otw(bank); out_data.data.gpio_config.value = htons(value); - out_data.data.gpio_config.mask = htons(mask); + out_data.data.gpio_config.mask = htons(0xffff); //send and recv usrp2_ctrl_data_t in_data = _impl->ctrl_send_and_recv(out_data); |