From 096405b9291d1d3b3ac37d9768232cca43a37db6 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 10 Dec 2010 18:57:17 -0800
Subject: packet_router: added control register to set the udp control port

---
 firmware/microblaze/apps/txrx_uhd.c     | 2 +-
 firmware/microblaze/lib/pkt_ctrl.c      | 5 +++--
 firmware/microblaze/lib/pkt_ctrl.h      | 2 +-
 firmware/microblaze/usrp2/memory_map.h  | 3 ++-
 firmware/microblaze/usrp2p/memory_map.h | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'firmware')

diff --git a/firmware/microblaze/apps/txrx_uhd.c b/firmware/microblaze/apps/txrx_uhd.c
index 8ee53ac3e..dc41e56c4 100644
--- a/firmware/microblaze/apps/txrx_uhd.c
+++ b/firmware/microblaze/apps/txrx_uhd.c
@@ -349,7 +349,7 @@ main(void)
 
   //1) register the addresses into the network stack
   register_addrs(ethernet_mac_addr(), get_ip_addr());
-  pkt_ctrl_program_inspector(get_ip_addr(), USRP2_UDP_DATA_PORT);
+  pkt_ctrl_program_inspector(get_ip_addr(), USRP2_UDP_CTRL_PORT, USRP2_UDP_DATA_PORT);
 
   //2) register callbacks for udp ports we service
   register_udp_listener(USRP2_UDP_CTRL_PORT, handle_udp_ctrl_packet);
diff --git a/firmware/microblaze/lib/pkt_ctrl.c b/firmware/microblaze/lib/pkt_ctrl.c
index d2bfc339d..7e095ec00 100644
--- a/firmware/microblaze/lib/pkt_ctrl.c
+++ b/firmware/microblaze/lib/pkt_ctrl.c
@@ -20,10 +20,11 @@
 #include <nonstdio.h>
 
 void pkt_ctrl_program_inspector(
-    const struct ip_addr *ip_addr, uint16_t dsp_udp_port
+    const struct ip_addr *ip_addr, uint16_t ctrl_port, uint16_t data_port
 ){
     buffer_pool_ctrl->ip_addr = ip_addr->addr;
-    buffer_pool_ctrl->udp_ports = dsp_udp_port;
+    buffer_pool_ctrl->ctrl_ports = ctrl_port;
+    buffer_pool_ctrl->data_ports = data_port;
 }
 
 void pkt_ctrl_set_routing_mode(pkt_ctrl_routing_mode_t mode){
diff --git a/firmware/microblaze/lib/pkt_ctrl.h b/firmware/microblaze/lib/pkt_ctrl.h
index 927d1fc7a..346e22094 100644
--- a/firmware/microblaze/lib/pkt_ctrl.h
+++ b/firmware/microblaze/lib/pkt_ctrl.h
@@ -30,7 +30,7 @@ typedef enum {
 
 //! Program the decision values into the packet inspector
 void pkt_ctrl_program_inspector(
-    const struct ip_addr *ip_addr, uint16_t dsp_udp_port
+    const struct ip_addr *ip_addr, uint16_t ctrl_port, uint16_t data_port
 );
 
 //! Set the routing mode for this device
diff --git a/firmware/microblaze/usrp2/memory_map.h b/firmware/microblaze/usrp2/memory_map.h
index 09aef643e..23d96389f 100644
--- a/firmware/microblaze/usrp2/memory_map.h
+++ b/firmware/microblaze/usrp2/memory_map.h
@@ -248,7 +248,8 @@ hwconfig_wishbone_divisor(void)
 typedef struct {
   volatile uint32_t misc_ctrl;
   volatile uint32_t ip_addr;
-  volatile uint32_t udp_ports; //dsp0 (low 16) dsp1 (high 16)
+  volatile uint32_t ctrl_ports; //ctrl (low 16) other (high 16)
+  volatile uint32_t data_ports; //dsp0 (low 16) dsp1 (high 16)
   volatile uint32_t cpu_out_ctrl;
   volatile uint32_t cpu_inp_ctrl;
 } buffer_pool_ctrl_t;
diff --git a/firmware/microblaze/usrp2p/memory_map.h b/firmware/microblaze/usrp2p/memory_map.h
index 277f433c5..5edb3b313 100644
--- a/firmware/microblaze/usrp2p/memory_map.h
+++ b/firmware/microblaze/usrp2p/memory_map.h
@@ -275,7 +275,8 @@ hwconfig_wishbone_divisor(void)
 typedef struct {
   volatile uint32_t misc_ctrl;
   volatile uint32_t ip_addr;
-  volatile uint32_t udp_ports; //dsp0 (low 16) dsp1 (high 16)
+  volatile uint32_t ctrl_ports; //ctrl (low 16) other (high 16)
+  volatile uint32_t data_ports; //dsp0 (low 16) dsp1 (high 16)
   volatile uint32_t cpu_out_ctrl;
   volatile uint32_t cpu_inp_ctrl;
 } buffer_pool_ctrl_t;
-- 
cgit v1.2.3