3 files changed, 13 insertions, 0 deletions
diff --git a/usrp2/firmware/apps/.gitignore b/usrp2/firmware/apps/.gitignore
index 855a28a47..33469a796 100644
--- a/usrp2/firmware/apps/.gitignore
+++ b/usrp2/firmware/apps/.gitignore
@@ -64,6 +64,7 @@
 /rx_only_v2
 /txrx
 /txrx_wbx
+/txrx_xcvr
 /eth_serdes
 /serdes_txrx
 /set_hw_rev
diff --git a/usrp2/firmware/apps/Makefile.am b/usrp2/firmware/apps/Makefile.am
index 045a05ab4..00f682fc7 100644
--- a/usrp2/firmware/apps/Makefile.am
+++ b/usrp2/firmware/apps/Makefile.am
@@ -46,6 +46,7 @@ noinst_PROGRAMS = \
 	tx_standalone \
 	txrx \
 	txrx_wbx \
+	txrx_xcvr \
 	factory_test \
 	burnrev30 \
 	burnrev31 \
@@ -63,6 +64,7 @@ noinst_PROGRAMS = \
 # tx_drop2_SOURCES = tx_drop2.c app_common.c
 txrx_SOURCES = txrx.c app_common_v2.c
 txrx_wbx_SOURCES = txrx.c app_common_v2.c
+txrx_xcvr_SOURCES = txrx.c app_common_v2.c
 factory_test_SOURCES = factory_test.c app_common_v2.c
 eth_serdes_SOURCES = eth_serdes.c app_passthru_v2.c
 serdes_txrx_SOURCES = serdes_txrx.c app_common_v2.c
@@ -71,6 +73,8 @@ mimo_tx_slave_SOURCES = mimo_tx_slave.c app_common_v2.c
 
 txrx_wbx_LDADD = ../lib/libu2fw_wbx.a
 
+txrx_xcvr_LDADD = ../lib/libu2fw_xcvr.a
+
 noinst_HEADERS = \
         app_common_v2.h \
         app_passthru_v2.h \
diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
index 036d0bace..7716ed992 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -494,6 +494,14 @@ handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len)
       ok = true;
       goto generic_reply;
 
+    case OP_RX_ANTENNA:
+        ok = db_set_antenna(rx_dboard, ((op_config_mimo_t *)payload)->flags);
+        goto generic_reply;
+
+    case OP_TX_ANTENNA:
+        ok = db_set_antenna(tx_dboard, ((op_config_mimo_t *)payload)->flags);
+        goto generic_reply;
+
     case OP_BURN_MAC_ADDR:
       ok = ethernet_set_mac_addr(&((op_burn_mac_addr_t *)payload)->addr);
       goto generic_reply;