Merge branch 'cordic_policy' into next

Conflicts:
	host/lib/usrp/usrp2/usrp2_regs.cpp
	host/lib/usrp/usrp2/usrp2_regs.hpp

1 files changed, 0 insertions, 8 deletions

diff --git a/firmware/zpu/apps/txrx_uhd.c b/firmware/zpu/apps/txrx_uhd.c
index 2030b1ce9..cd66c18f1 100644
--- a/firmware/zpu/apps/txrx_uhd.c
+++ b/firmware/zpu/apps/txrx_uhd.c
@@ -192,10 +192,6 @@ static void handle_udp_ctrl_packet(
             printf("error! tried to poke into 0x%x\n", ctrl_data_in->data.poke_args.addr);
         }
         else switch(ctrl_data_in->data.poke_args.num_bytes){
-        case sizeof(uint64_t):
-            *((uint32_t *) ctrl_data_in->data.poke_args.addrhi) = (uint32_t)ctrl_data_in->data.poke_args.datahi;
-            //continue to uint32_t for low addr:
-
         case sizeof(uint32_t):
             *((uint32_t *) ctrl_data_in->data.poke_args.addr) = (uint32_t)ctrl_data_in->data.poke_args.data;
             break;
@@ -214,10 +210,6 @@ static void handle_udp_ctrl_packet(
 
     case USRP2_CTRL_ID_PEEK_AT_THIS_REGISTER_FOR_ME_BRO:
         switch(ctrl_data_in->data.poke_args.num_bytes){
-        case sizeof(uint64_t):
-            ctrl_data_out.data.poke_args.datahi = *((uint32_t *) ctrl_data_in->data.poke_args.addrhi);
-            //continue to uint32_t for low addr:
-
         case sizeof(uint32_t):
             ctrl_data_out.data.poke_args.data = *((uint32_t *) ctrl_data_in->data.poke_args.addr);
             break;