[Commit-gnuradio] [gnuradio] 05/148: Removed references to U2_ETHERTYPE and CONTROL_CHAN. Moved non-txrx-related apps in firmware broken by this.

[git]

This is an automated email from the git hooks/post-receive script.

nwest pushed a commit to annotated tag old_usrp_devel_udp
in repository gnuradio.

commit 78b981cc562058f36a44e247efa2f518339fbad8
Author: Josh Blum <address@hidden>
Date:   Fri Oct 30 15:44:49 2009 -0700

    Removed references to U2_ETHERTYPE and CONTROL_CHAN.
    Moved non-txrx-related apps in firmware broken by this.
---
 usrp2/firmware/apps/Makefile.am           | 18 +++++++++---------
 usrp2/firmware/apps/app_common_v2.c       |  2 +-
 usrp2/firmware/include/usrp2_eth_packet.h |  6 ++----
 usrp2/host/lib/find.cc                    |  4 ++--
 usrp2/host/lib/usrp2_impl.cc              |  2 +-
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/usrp2/firmware/apps/Makefile.am b/usrp2/firmware/apps/Makefile.am
index b809039..66f5753 100644
--- a/usrp2/firmware/apps/Makefile.am
+++ b/usrp2/firmware/apps/Makefile.am
@@ -26,12 +26,9 @@ noinst_PROGRAMS = \
        burn_dbsrx_eeprom \
        can_i_sub \
        echo \
-       eth_serdes \
-       gen_eth_packets \
        hello \
        ibs_rx_test \
        ibs_tx_test \
-       rcv_eth_packets \
        read_dbids \
        set_hw_rev \
        test1 \
@@ -43,20 +40,23 @@ noinst_PROGRAMS = \
        test_lsadc \
        test_lsdac \
        timer_test \
-       tx_standalone \
        txrx \
-       factory_test \
        burnrev30 \
        burnrev31 \
        burnrev40 \
-       serdes_txrx \
        sd_gentest \
-       sd_bounce \
+       sd_bounce
+
+nononono =  \
+       eth_serdes \
+       gen_eth_packets \
+       rcv_eth_packets \
+       tx_standalone \
+       factory_test \
+       serdes_txrx \
        mimo_tx \
        mimo_tx_slave
 
-
-
 # tx_drop_SOURCES = tx_drop.c app_common.c
 # tx_drop_rate_limited_SOURCES = tx_drop_rate_limited.c app_common.c
 # tx_drop2_SOURCES = tx_drop2.c app_common.c
diff --git a/usrp2/firmware/apps/app_common_v2.c 
b/usrp2/firmware/apps/app_common_v2.c
index c6459ca..a0c3223 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -76,7 +76,7 @@ set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t 
const *cmd_pkt)
   reply_pkt->thdr.fifo_status = 0;     // written by protocol engine
   reply_pkt->thdr.seqno = 0;           // written by protocol engine
   reply_pkt->thdr.ack = 0;             // written by protocol engine
-  u2p_set_word0(&reply_pkt->fixed, 0, CONTROL_CHAN);
+  u2p_set_word0(&reply_pkt->fixed, 0, 0);
   reply_pkt->fixed.timestamp = timer_regs->time;
 }
 
diff --git a/usrp2/firmware/include/usrp2_eth_packet.h 
b/usrp2/firmware/include/usrp2_eth_packet.h
index 89b2159..a56a1d0 100644
--- a/usrp2/firmware/include/usrp2_eth_packet.h
+++ b/usrp2/firmware/include/usrp2_eth_packet.h
@@ -26,9 +26,8 @@
 
 __U2_BEGIN_DECLS
 
-#define U2_ETHERTYPE           0xBEEF  // used in our frames
-#define U2_DATA_ETHERTYPE              U2_ETHERTYPE
-#define U2_CTRL_ETHERTYPE              U2_ETHERTYPE+1
+#define U2_DATA_ETHERTYPE              0xBEEF  // used in our data frames
+#define U2_CTRL_ETHERTYPE              0xBEF0  // used in our control frames
 #define        MAC_CTRL_ETHERTYPE      0x8808  // used in PAUSE frames
 
 /*
@@ -102,7 +101,6 @@ typedef struct {
 
 #define        U2P_ALL_FLAGS           0x00000007
 
-#define        CONTROL_CHAN            0x1f
 
 static inline int
 u2p_chan(u2_fixed_hdr_t *p)
diff --git a/usrp2/host/lib/find.cc b/usrp2/host/lib/find.cc
index ddb7aa9..aa7fe11 100644
--- a/usrp2/host/lib/find.cc
+++ b/usrp2/host/lib/find.cc
@@ -96,7 +96,7 @@ namespace usrp2 {
        break;
       
       reply *rp = (reply *)pktbuf;
-      if (u2p_chan(&rp->h.fixed) != CONTROL_CHAN)      // ignore
+      if (u2p_chan(&rp->h.fixed) != 0)         // ignore
        continue;
       if (rp->op_id_reply.opcode != OP_ID_REPLY)       // ignore
        continue;
@@ -147,7 +147,7 @@ namespace usrp2 {
     c->h.thdr.flags = 0;
     c->h.thdr.seqno = 0;
     c->h.thdr.ack = 0;
-    u2p_set_word0(&c->h.fixed, 0, CONTROL_CHAN);
+    u2p_set_word0(&c->h.fixed, 0, 0);
     u2p_set_timestamp(&c->h.fixed, -1);
     c->op_id.opcode = OP_ID;
     c->op_id.len = sizeof(c->op_id);
diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc
index 514b6ca..18bf404 100644
--- a/usrp2/host/lib/usrp2_impl.cc
+++ b/usrp2/host/lib/usrp2_impl.cc
@@ -298,7 +298,7 @@ namespace usrp2 {
     p->thdr.flags = 0; // FIXME transport header values?
     p->thdr.seqno = 0;
     p->thdr.ack = 0;
-    u2p_set_word0(&p->fixed, word0_flags, CONTROL_CHAN);
+    u2p_set_word0(&p->fixed, word0_flags, 0);
     u2p_set_timestamp(&p->fixed, timestamp);
   }