[Commit-gnuradio] [gnuradio] 44/148: Removed temporary u2_eth_packet_only_t. Removed the fixed header portion from the u2_eth_packet_t. Removed places in code where control uses the fixed header (always unused 0 for word, and -1 for timestamp). Flagged the fixed header stuff for removal (once we get vrt tx).

[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 6300b90fd320b3adf00296b65c3e55505821fd96
Author: Josh Blum <address@hidden>
Date:   Wed Nov 18 18:59:46 2009 -0800

    Removed temporary u2_eth_packet_only_t.
    Removed the fixed header portion from the u2_eth_packet_t.
    Removed places in code where control uses the fixed header (always unused 0 
for word, and -1 for timestamp).
    Flagged the fixed header stuff for removal (once we get vrt tx).
---
 usrp2/firmware/apps/app_common_v2.c       |  2 --
 usrp2/firmware/apps/txrx.c                |  2 +-
 usrp2/firmware/include/usrp2_eth_packet.h | 21 ++++++--------------
 usrp2/host/lib/control.h                  | 17 ----------------
 usrp2/host/lib/eth_ctrl_transport.cc      |  8 ++++----
 usrp2/host/lib/eth_data_transport.cc      |  8 ++++----
 usrp2/host/lib/find.cc                    |  5 +----
 usrp2/host/lib/usrp2_impl.cc              | 33 ++++---------------------------
 usrp2/host/lib/usrp2_impl.h               |  1 -
 9 files changed, 20 insertions(+), 77 deletions(-)

diff --git a/usrp2/firmware/apps/app_common_v2.c 
b/usrp2/firmware/apps/app_common_v2.c
index a0c3223..4718dd4 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -76,8 +76,6 @@ 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, 0);
-  reply_pkt->fixed.timestamp = timer_regs->time;
 }
 
 static void
diff --git a/usrp2/firmware/apps/txrx.c b/usrp2/firmware/apps/txrx.c
index 8f0df8e..65b40d7 100644
--- a/usrp2/firmware/apps/txrx.c
+++ b/usrp2/firmware/apps/txrx.c
@@ -176,7 +176,7 @@ start_rx_streaming_cmd(const u2_mac_addr_t *host, 
op_start_rx_streaming_t *p)
   /*
    * Construct  ethernet header and preload into two buffers
    */
-  u2_eth_packet_only_t pkt;
+  u2_eth_packet_t      pkt;
   memset(&pkt, 0, sizeof(pkt));
   pkt.ehdr.dst = *host;
   pkt.ehdr.src = *ethernet_mac_addr();
diff --git a/usrp2/firmware/include/usrp2_eth_packet.h 
b/usrp2/firmware/include/usrp2_eth_packet.h
index 4fc75e3..cd55b27 100644
--- a/usrp2/firmware/include/usrp2_eth_packet.h
+++ b/usrp2/firmware/include/usrp2_eth_packet.h
@@ -86,7 +86,7 @@ typedef struct {
  *  mbz == must be zero
  */
 
-typedef struct {
+typedef struct { // FIXME remove when we get vrt tx
   uint32_t     word0;          // flags etc
   uint32_t     timestamp;      // time of rx or tx (100 MHz)
 } u2_fixed_hdr_t;
@@ -102,32 +102,32 @@ typedef struct {
 #define        U2P_ALL_FLAGS           0x00000007
 
 
-static inline int
+static inline int // FIXME remove when we get vrt tx
 u2p_chan(u2_fixed_hdr_t *p)
 {
   return (ntohl(p->word0) >> U2P_CHAN_SHIFT) & U2P_CHAN_MASK;
 }
 
-inline static uint32_t
+inline static uint32_t // FIXME remove when we get vrt tx
 u2p_word0(u2_fixed_hdr_t *p)
 {
   return ntohl(p->word0);
 }
 
-inline static uint32_t
+inline static uint32_t // FIXME remove when we get vrt tx
 u2p_timestamp(u2_fixed_hdr_t *p)
 {
   return ntohl(p->timestamp);
 }
 
-inline static void
+inline static void  // FIXME remove when we get vrt tx
 u2p_set_word0(u2_fixed_hdr_t *p, int flags, int chan)
 {
   p->word0 = htonl((flags & U2P_ALL_FLAGS)
                   | ((chan & U2P_CHAN_MASK) << U2P_CHAN_SHIFT));
 }
 
-inline static void
+inline static void  // FIXME remove when we get vrt tx
 u2p_set_timestamp(u2_fixed_hdr_t *p, uint32_t ts)
 {
   p->timestamp = htonl(ts);
@@ -139,15 +139,6 @@ u2p_set_timestamp(u2_fixed_hdr_t *p, uint32_t ts)
 typedef struct {
   u2_eth_hdr_t         ehdr;
   u2_transport_hdr_t   thdr;
-} u2_eth_packet_only_t;
-
-/*!
- * \brief consolidated packet: ethernet header + transport header + fixed 
header
- */
-typedef struct {
-  u2_eth_hdr_t         ehdr;
-  u2_transport_hdr_t   thdr;
-  u2_fixed_hdr_t       fixed;
 } u2_eth_packet_t;
 
 /*
diff --git a/usrp2/host/lib/control.h b/usrp2/host/lib/control.h
index 80bd159..091b93f 100644
--- a/usrp2/host/lib/control.h
+++ b/usrp2/host/lib/control.h
@@ -24,12 +24,7 @@
 
 namespace usrp2 {
 
-  typedef struct{
-    u2_fixed_hdr_t fixed;
-  } op_fixed_hdr_t;
-
   struct op_generic_cmd {
-    op_fixed_hdr_t h;
     op_generic_t    op;
     op_generic_t    eop;
   };
@@ -39,78 +34,66 @@ namespace usrp2 {
    */
   struct op_config_rx_v2_cmd 
   {
-    op_fixed_hdr_t   h;
     op_config_rx_v2_t op;
     op_generic_t      eop;
   };
 
   struct op_start_rx_streaming_cmd 
   {
-    op_fixed_hdr_t         h;
     op_start_rx_streaming_t op;
     op_generic_t           eop;
   };
     
   struct op_stop_rx_cmd {
-    op_fixed_hdr_t h;
     op_generic_t    op;
     op_generic_t    eop;
   };
 
   struct op_config_tx_v2_cmd 
   {
-    op_fixed_hdr_t   h;
     op_config_tx_v2_t op;
     op_generic_t      eop;
   };
 
   struct op_config_mimo_cmd
   {
-    op_fixed_hdr_t   h;
     op_config_mimo_t  op;
     op_generic_t      eop;
   };
 
   struct op_burn_mac_addr_cmd 
   {
-    op_fixed_hdr_t    h;
     op_burn_mac_addr_t op;
     op_generic_t       eop;
   };
 
   struct op_dboard_info_cmd {
-    op_fixed_hdr_t h;
     op_generic_t    op;
     op_generic_t    eop;
   };
 
   struct op_peek_cmd {
-    op_fixed_hdr_t h;
     op_peek_t       op;
     op_generic_t    eop;
   };
 
   struct op_poke_cmd {
-    op_fixed_hdr_t h;
     op_poke_t       op;
     // words to write go here
     // eop must be dynamically written here
   };
 
   struct op_freq_cmd {
-    op_fixed_hdr_t h;
     op_freq_t       op;
     op_generic_t    eop;
   };
 
   struct op_gpio_cmd {
-    op_fixed_hdr_t h;
     op_gpio_t       op;
     op_generic_t    eop;
   };
 
   struct op_gpio_set_sels_cmd {
-    op_fixed_hdr_t h;
     op_gpio_set_sels_t op;
     op_generic_t    eop;
   };
diff --git a/usrp2/host/lib/eth_ctrl_transport.cc 
b/usrp2/host/lib/eth_ctrl_transport.cc
index a8bf3e3..7fd356d 100644
--- a/usrp2/host/lib/eth_ctrl_transport.cc
+++ b/usrp2/host/lib/eth_ctrl_transport.cc
@@ -46,7 +46,7 @@ int usrp2::eth_ctrl_transport::sendv(const iovec *iov, size_t 
iovlen){
         all_iov[i+1] = iov[i];
     }
     //setup a new ethernet header
-    u2_eth_packet_only_t hdr;
+    u2_eth_packet_t hdr;
     hdr.ehdr.ethertype = htons(U2_CTRL_ETHERTYPE);
     memcpy(&hdr.ehdr.dst, d_mac.addr, 6);
     memcpy(&hdr.ehdr.src, d_eth_ctrl->mac(), 6);
@@ -72,11 +72,11 @@ std::vector<usrp2::sbuff::sptr> 
usrp2::eth_ctrl_transport::recv(){
     //TODO perform multiple non blocking recvs and pack into sbs
     int recv_len = d_eth_ctrl->read_packet_dont_block(d_buff, sizeof(d_buff));
     //strip the ethernet headers from the buffer
-    if (recv_len > (signed)sizeof(u2_eth_packet_only_t)){
+    if (recv_len > (signed)sizeof(u2_eth_packet_t)){
         std::vector<sbuff::sptr> sbs;
         sbs.push_back(sbuff::make(
-            d_buff + sizeof(u2_eth_packet_only_t),
-            recv_len - sizeof(u2_eth_packet_only_t)));
+            d_buff + sizeof(u2_eth_packet_t),
+            recv_len - sizeof(u2_eth_packet_t)));
         return sbs;
     }
     boost::this_thread::sleep(gruel::get_new_timeout(0.05)); //50ms timeout
diff --git a/usrp2/host/lib/eth_data_transport.cc 
b/usrp2/host/lib/eth_data_transport.cc
index eaca5e3..c41bb63 100644
--- a/usrp2/host/lib/eth_data_transport.cc
+++ b/usrp2/host/lib/eth_data_transport.cc
@@ -57,7 +57,7 @@ int usrp2::eth_data_transport::sendv(const iovec *iov, size_t 
iovlen){
         all_iov[i+1] = iov[i];
     }
     //setup a new ethernet header
-    u2_eth_packet_only_t hdr;
+    u2_eth_packet_t hdr;
     hdr.ehdr.ethertype = htons(U2_DATA_ETHERTYPE);
     memcpy(&hdr.ehdr.dst, d_mac.addr, 6);
     memcpy(&hdr.ehdr.src, d_eth_data->mac(), 6);
@@ -81,7 +81,7 @@ std::vector<usrp2::sbuff::sptr> 
usrp2::eth_data_transport::recv(){
         void *base = iovs[i].iov_base;
         size_t len = iovs[i].iov_len;
 
-        u2_eth_packet_only_t *hdr = (u2_eth_packet_only_t *)base;
+        u2_eth_packet_t *hdr = (u2_eth_packet_t *)base;
         d_num_rx_frames++;
         d_num_rx_bytes += len;
 
@@ -107,8 +107,8 @@ std::vector<usrp2::sbuff::sptr> 
usrp2::eth_data_transport::recv(){
 
         //drop the ethernet and transport headers
         sbs.push_back(sbuff::make(
-            (uint8_t*)base + sizeof(u2_eth_packet_only_t),
-            len - sizeof(u2_eth_packet_only_t),
+            (uint8_t*)base + sizeof(u2_eth_packet_t),
+            len - sizeof(u2_eth_packet_t),
             boost::bind(&eth_buffer::release_frame, d_eth_data, base)));
     }
     return sbs;
diff --git a/usrp2/host/lib/find.cc b/usrp2/host/lib/find.cc
index aa7fe11..b12aedb 100644
--- a/usrp2/host/lib/find.cc
+++ b/usrp2/host/lib/find.cc
@@ -33,6 +33,7 @@
 
 #define FIND_DEBUG 0
 
+// FIXME re-implement with eth_ctrl_transport 
 
 // FIXME move to gruel
 
@@ -96,8 +97,6 @@ namespace usrp2 {
        break;
       
       reply *rp = (reply *)pktbuf;
-      if (u2p_chan(&rp->h.fixed) != 0)         // ignore
-       continue;
       if (rp->op_id_reply.opcode != OP_ID_REPLY)       // ignore
        continue;
       
@@ -147,8 +146,6 @@ namespace usrp2 {
     c->h.thdr.flags = 0;
     c->h.thdr.seqno = 0;
     c->h.thdr.ack = 0;
-    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);
     int len = std::max((size_t) ethernet::MIN_PKTLEN, sizeof(command));
diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc
index cfb15d9..0c7b1cc 100644
--- a/usrp2/host/lib/usrp2_impl.cc
+++ b/usrp2/host/lib/usrp2_impl.cc
@@ -159,16 +159,9 @@ namespace usrp2 {
   }
 
   void
-  usrp2::impl::init_op_ctrl_hdrs(op_fixed_hdr_t *p, int word0_flags, uint32_t 
timestamp){
-    u2p_set_word0(&p->fixed, word0_flags, 0);
-    u2p_set_timestamp(&p->fixed, timestamp);
-  }
-  
-  void
   usrp2::impl::init_config_rx_v2_cmd(op_config_rx_v2_cmd *cmd)
   {
-    memset(cmd, 0, sizeof(*cmd)); 
-    init_op_ctrl_hdrs(&cmd->h, 0, -1);
+    memset(cmd, 0, sizeof(*cmd));
     cmd->op.opcode = OP_CONFIG_RX_V2;
     cmd->op.len = sizeof(cmd->op);
     cmd->op.rid = d_next_rid++;
@@ -179,8 +172,7 @@ namespace usrp2 {
   void
   usrp2::impl::init_config_tx_v2_cmd(op_config_tx_v2_cmd *cmd)
   {
-    memset(cmd, 0, sizeof(*cmd)); 
-    init_op_ctrl_hdrs(&cmd->h, 0, -1);
+    memset(cmd, 0, sizeof(*cmd));
     cmd->op.opcode = OP_CONFIG_TX_V2;
     cmd->op.len = sizeof(cmd->op);
     cmd->op.rid = d_next_rid++;
@@ -220,7 +212,7 @@ namespace usrp2 {
         sbuff::sptr sb = sbs[i];
 
         // point to beginning of payload (subpackets)
-        unsigned char *p = (unsigned char *)sb->buff() + 
sizeof(u2_fixed_hdr_t);
+        unsigned char *p = (unsigned char *)sb->buff();
         
         // FIXME (p % 4) == 2.  Not good.  Must watch for unaligned loads.
 
@@ -267,7 +259,7 @@ namespace usrp2 {
             &rd.hdr, &rd.payload, &rd.n32_bit_words_payload) //out
             or not rd.hdr.stream_id_p()
         ){
-            printf("Bad vrt header 0x%.8x, Packet len %d\n", rd.hdr.header, 
rd.sb->len());
+            printf("Bad vrt header 0x%.8x, Packet len %u\n", rd.hdr.header, 
rd.sb->len());
             DEBUG_LOG("!");
             rd.sb->done(); //mark done, this sbuff is no longer needed
             continue;
@@ -326,7 +318,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_SET_RX_LO_OFFSET;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -453,7 +444,6 @@ namespace usrp2 {
       op_generic_t reply;
 
       memset(&cmd, 0, sizeof(cmd));
-      init_op_ctrl_hdrs(&cmd.h, 0, -1);
       cmd.op.opcode = OP_START_RX_STREAMING;
       cmd.op.len = sizeof(cmd.op);
       cmd.op.rid = d_next_rid++;
@@ -502,7 +492,6 @@ namespace usrp2 {
       gruel::scoped_lock l(d_channel_rings_mutex);
 
       memset(&cmd, 0, sizeof(cmd));
-      init_op_ctrl_hdrs(&cmd.h, 0, -1);
       cmd.op.opcode = OP_STOP_RX;
       cmd.op.len = sizeof(cmd.op);
       cmd.op.rid = d_next_rid++;
@@ -620,7 +609,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_SET_TX_LO_OFFSET;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -862,7 +850,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_CONFIG_MIMO;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -922,7 +909,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_BURN_MAC_ADDR;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -960,7 +946,6 @@ namespace usrp2 {
     op_dboard_info_reply_t     reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_DBOARD_INFO;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -987,7 +972,6 @@ namespace usrp2 {
     op_generic_t   reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_SYNC_TO_PPS;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1008,7 +992,6 @@ namespace usrp2 {
     op_generic_t   reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_SYNC_EVERY_PPS;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1045,7 +1028,6 @@ namespace usrp2 {
     size_t bytes = words*wlen;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_PEEK;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1101,7 +1083,6 @@ namespace usrp2 {
     cmd = (op_poke_cmd *)malloc(l);
     //fprintf(stderr, "cmd=%p l=%i\n", cmd, l);
     memset(cmd, 0, l);
-    init_op_ctrl_hdrs(&cmd->h, 0, -1);
     cmd->op.opcode = OP_POKE;
     cmd->op.len = sizeof(cmd->op)+bytes;
     cmd->op.rid = d_next_rid++;
@@ -1138,7 +1119,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_RESET_DB;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1164,7 +1144,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_GPIO_SET_DDR;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1198,7 +1177,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_GPIO_SET_SELS;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1226,7 +1204,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_GPIO_WRITE;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1255,7 +1232,6 @@ namespace usrp2 {
     op_gpio_read_reply_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_GPIO_READ;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
@@ -1292,7 +1268,6 @@ namespace usrp2 {
     op_generic_t reply;
 
     memset(&cmd, 0, sizeof(cmd));
-    init_op_ctrl_hdrs(&cmd.h, 0, -1);
     cmd.op.opcode = OP_GPIO_STREAM;
     cmd.op.len = sizeof(cmd.op);
     cmd.op.rid = d_next_rid++;
diff --git a/usrp2/host/lib/usrp2_impl.h b/usrp2/host/lib/usrp2_impl.h
index 223a5fb..d74f903 100644
--- a/usrp2/host/lib/usrp2_impl.h
+++ b/usrp2/host/lib/usrp2_impl.h
@@ -86,7 +86,6 @@ namespace usrp2 {
         d_data_pending_cond.notify_one();
     }
 
-    void init_op_ctrl_hdrs(op_fixed_hdr_t *p, int word0_flags, uint32_t 
timestamp);
     void init_config_rx_v2_cmd(op_config_rx_v2_cmd *cmd);
     void init_config_tx_v2_cmd(op_config_tx_v2_cmd *cmd);
     bool transmit_cmd_and_wait(void *cmd, size_t len, pending_reply *p, double 
secs=0.0);