8 files changed, 21 insertions, 21 deletions
diff --git a/gr-uhd/include/gnuradio/uhd/usrp_block.h b/gr-uhd/include/gnuradio/uhd/usrp_block.h
index 73001b891c..2814bbdf08 100644
--- a/gr-uhd/include/gnuradio/uhd/usrp_block.h
+++ b/gr-uhd/include/gnuradio/uhd/usrp_block.h
@@ -38,8 +38,8 @@ GR_UHD_API const pmt::pmt_t cmd_tag_key();
 GR_UHD_API const pmt::pmt_t cmd_gpio_key();
 GR_UHD_API const pmt::pmt_t cmd_pc_clock_resync_key();
 
-GR_UHD_API const pmt::pmt_t ant_direction_rx();
-GR_UHD_API const pmt::pmt_t ant_direction_tx();
+GR_UHD_API const pmt::pmt_t direction_rx();
+GR_UHD_API const pmt::pmt_t direction_tx();
 
 /*! Base class for USRP blocks.
  * \ingroup uhd_blk
diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
index 973aa96c80..1f13591e2d 100644
--- a/gr-uhd/lib/usrp_block_impl.cc
+++ b/gr-uhd/lib/usrp_block_impl.cc
@@ -122,12 +122,12 @@ const pmt::pmt_t gr::uhd::cmd_gpio_key()
     return val;
 }
 
-const pmt::pmt_t gr::uhd::ant_direction_rx()
+const pmt::pmt_t gr::uhd::direction_rx()
 {
     static const pmt::pmt_t val = pmt::mp("RX");
     return val;
 }
-const pmt::pmt_t gr::uhd::ant_direction_tx()
+const pmt::pmt_t gr::uhd::direction_tx()
 {
     static const pmt::pmt_t val = pmt::mp("TX");
     return val;
@@ -291,14 +291,14 @@ void usrp_block_impl::_set_center_freq_from_internals_allchans()
     while (_rx_chans_to_tune.any()) {
         // This resets() bits, so this loop should not run indefinitely
         chan = _rx_chans_to_tune.find_first();
-        _set_center_freq_from_internals(chan, ant_direction_rx());
+        _set_center_freq_from_internals(chan, direction_rx());
         _rx_chans_to_tune.reset(chan);
     }
 
     while (_tx_chans_to_tune.any()) {
         // This resets() bits, so this loop should not run indefinitely
         chan = _tx_chans_to_tune.find_first();
-        _set_center_freq_from_internals(chan, ant_direction_tx());
+        _set_center_freq_from_internals(chan, direction_tx());
         _tx_chans_to_tune.reset(chan);
     }
 }
@@ -581,7 +581,7 @@ void usrp_block_impl::_update_curr_tune_req(::uhd::tune_request_t& tune_req,
         return;
     }
 
-    if (pmt::eqv(direction, ant_direction_rx())) {
+    if (pmt::eqv(direction, direction_rx())) {
         if (tune_req.target_freq != _curr_rx_tune_req[chan].target_freq ||
             tune_req.rf_freq_policy != _curr_rx_tune_req[chan].rf_freq_policy ||
             tune_req.rf_freq != _curr_rx_tune_req[chan].rf_freq ||
@@ -637,7 +637,7 @@ void usrp_block_impl::_cmd_handler_looffset(const pmt::pmt_t& lo_offset,
 
     double lo_offs = pmt::to_double(lo_offset);
     ::uhd::tune_request_t new_tune_request;
-    if (pmt::eqv(direction, ant_direction_rx())) {
+    if (pmt::eqv(direction, direction_rx())) {
         new_tune_request = _curr_rx_tune_req[chan];
     } else {
         new_tune_request = _curr_tx_tune_req[chan];
@@ -845,7 +845,7 @@ void usrp_block_impl::_cmd_handler_lofreq(const pmt::pmt_t& lofreq,
     }
 
     ::uhd::tune_request_t new_tune_request;
-    if (pmt::eqv(direction, ant_direction_rx())) {
+    if (pmt::eqv(direction, direction_rx())) {
         new_tune_request = _curr_rx_tune_req[chan];
     } else {
         new_tune_request = _curr_tx_tune_req[chan];
@@ -882,7 +882,7 @@ void usrp_block_impl::_cmd_handler_dspfreq(const pmt::pmt_t& dspfreq,
     }
 
     ::uhd::tune_request_t new_tune_request;
-    if (pmt::eqv(direction, ant_direction_rx())) {
+    if (pmt::eqv(direction, direction_rx())) {
         new_tune_request = _curr_rx_tune_req[chan];
     } else {
         new_tune_request = _curr_tx_tune_req[chan];
@@ -902,7 +902,7 @@ usrp_block_impl::get_cmd_or_default_direction(const pmt::pmt_t& cmd) const
 
     // if the direction key exists and is either "TX" or "RX", return that
     if (pmt::is_symbol(dir) &&
-        (pmt::eqv(dir, ant_direction_rx()) || pmt::eqv(dir, ant_direction_tx()))) {
+        (pmt::eqv(dir, direction_rx()) || pmt::eqv(dir, direction_tx()))) {
         return dir;
     }
     // otherwise return the direction key for the block that received the cmd
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc
index 50f676d454..8b460e4cd9 100644
--- a/gr-uhd/lib/usrp_sink_impl.cc
+++ b/gr-uhd/lib/usrp_sink_impl.cc
@@ -98,7 +98,7 @@ usrp_sink_impl::set_center_freq(const ::uhd::tune_request_t tune_request, size_t
 ::uhd::tune_result_t usrp_sink_impl::_set_center_freq_from_internals(size_t chan,
                                                                      pmt::pmt_t direction)
 {
-    if (pmt::eqv(direction, ant_direction_rx())) {
+    if (pmt::eqv(direction, direction_rx())) {
         // TODO: what happens if the RX device is not instantiated? Catch error?
         _rx_chans_to_tune.reset(chan);
         return _dev->set_rx_freq(_curr_rx_tune_req[chan], _stream_args.channels[chan]);
@@ -123,7 +123,7 @@ double usrp_sink_impl::get_center_freq(size_t chan)
 void usrp_sink_impl::set_gain(double gain, size_t chan, pmt::pmt_t direction)
 {
     chan = _stream_args.channels[chan];
-    if (pmt::eqv(direction, ant_direction_rx())) {
+    if (pmt::eqv(direction, direction_rx())) {
         return _dev->set_rx_gain(gain, chan);
     } else {
         return _dev->set_tx_gain(gain, chan);
diff --git a/gr-uhd/lib/usrp_sink_impl.h b/gr-uhd/lib/usrp_sink_impl.h
index 45b2723569..6493d79f10 100644
--- a/gr-uhd/lib/usrp_sink_impl.h
+++ b/gr-uhd/lib/usrp_sink_impl.h
@@ -143,7 +143,7 @@ private:
     void async_event_loop();
     gr::thread::thread _async_event_thread;
 
-    const pmt::pmt_t _direction() const override { return ant_direction_tx(); };
+    const pmt::pmt_t _direction() const override { return direction_tx(); };
 };
 
 } /* namespace uhd */
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc
index 346a5bca89..b5ecdfffcd 100644
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@ -112,7 +112,7 @@ usrp_source_impl::set_center_freq(const ::uhd::tune_request_t tune_request, size
 ::uhd::tune_result_t
 usrp_source_impl::_set_center_freq_from_internals(size_t chan, pmt::pmt_t direction)
 {
-    if (pmt::eqv(direction, ant_direction_tx())) {
+    if (pmt::eqv(direction, direction_tx())) {
         // TODO: what happens if the TX device is not instantiated? Catch error?
         _tx_chans_to_tune.reset(chan);
         return _dev->set_tx_freq(_curr_tx_tune_req[chan], _stream_args.channels[chan]);
@@ -137,7 +137,7 @@ double usrp_source_impl::get_center_freq(size_t chan)
 void usrp_source_impl::set_gain(double gain, size_t chan, pmt::pmt_t direction)
 {
     chan = _stream_args.channels[chan];
-    if (pmt::eqv(direction, ant_direction_tx())) {
+    if (pmt::eqv(direction, direction_tx())) {
         return _dev->set_tx_gain(gain, chan);
     } else {
         return _dev->set_rx_gain(gain, chan);
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h
index f0ab1490e8..437fe79157 100644
--- a/gr-uhd/lib/usrp_source_impl.h
+++ b/gr-uhd/lib/usrp_source_impl.h
@@ -147,7 +147,7 @@ private:
 
     std::recursive_mutex d_mutex;
 
-    const pmt::pmt_t _direction() const override { return ant_direction_rx(); };
+    const pmt::pmt_t _direction() const override { return direction_rx(); };
 };
 
 } /* namespace uhd */
diff --git a/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h b/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h
index 6f792dae49..58946334d9 100644
--- a/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h
+++ b/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h
@@ -246,7 +246,7 @@ static const char* __doc_gr_uhd_cmd_direction_key = R"doc()doc";
 static const char* __doc_gr_uhd_cmd_tag_key = R"doc()doc";
 
 
-static const char* __doc_gr_uhd_ant_direction_rx = R"doc()doc";
+static const char* __doc_gr_uhd_direction_rx = R"doc()doc";
 
 
-static const char* __doc_gr_uhd_ant_direction_tx = R"doc()doc";
+static const char* __doc_gr_uhd_direction_tx = R"doc()doc";
diff --git a/gr-uhd/python/uhd/bindings/usrp_block_python.cc b/gr-uhd/python/uhd/bindings/usrp_block_python.cc
index 18948175b8..5f15a14f8f 100644
--- a/gr-uhd/python/uhd/bindings/usrp_block_python.cc
+++ b/gr-uhd/python/uhd/bindings/usrp_block_python.cc
@@ -476,8 +476,8 @@ void bind_usrp_block(py::module& m)
     m.def("cmd_tag_key", &::gr::uhd::cmd_tag_key, D(cmd_tag_key));
 
 
-    m.def("ant_direction_rx", &::gr::uhd::ant_direction_rx, D(ant_direction_rx));
+    m.def("direction_rx", &::gr::uhd::direction_rx, D(direction_rx));
 
 
-    m.def("ant_direction_tx", &::gr::uhd::ant_direction_tx, D(ant_direction_tx));
+    m.def("direction_tx", &::gr::uhd::direction_tx, D(direction_tx));
 }