[Commit-gnuradio] [gnuradio] 97/148: removed the usrp2_bytesex header since it only imported from gruel

[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 ddced4abc5ab451167116445ebc96df0b882aa33
Author: Josh Blum <address@hidden>
Date:   Fri Dec 18 14:33:31 2009 -0800

    removed the usrp2_bytesex header since it only imported from gruel
---
 usrp2/firmware/include/usrp2_eth_packet.h |  1 -
 usrp2/host/include/usrp2/usrp2.h          |  1 -
 usrp2/host/lib/Makefile.am                |  1 -
 usrp2/host/lib/eth_ctrl_transport.cc      |  1 +
 usrp2/host/lib/find.cc                    |  1 +
 usrp2/host/lib/usrp2_bytesex.h            | 19 -------------------
 usrp2/host/lib/usrp2_impl.cc              |  2 +-
 usrp2/host/lib/usrp2_impl.h               |  1 -
 8 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/usrp2/firmware/include/usrp2_eth_packet.h 
b/usrp2/firmware/include/usrp2_eth_packet.h
index 80ee373..6c8ef12 100644
--- a/usrp2/firmware/include/usrp2_eth_packet.h
+++ b/usrp2/firmware/include/usrp2_eth_packet.h
@@ -20,7 +20,6 @@
 #define INCLUDED_USRP2_ETH_PACKET_H
 
 #include "usrp2_cdefs.h"
-#include "usrp2_bytesex.h"
 #include "usrp2_mac_addr.h"
 #include "usrp2_mimo_config.h"
 
diff --git a/usrp2/host/include/usrp2/usrp2.h b/usrp2/host/include/usrp2/usrp2.h
index 949e457..5246c79 100644
--- a/usrp2/host/include/usrp2/usrp2.h
+++ b/usrp2/host/include/usrp2/usrp2.h
@@ -87,7 +87,6 @@ namespace usrp2 {
   class usrp2 : boost::noncopyable
   {
   public:
-    static const unsigned int MAX_CHAN = 30;
 
     /*!
      * Shared pointer to this class
diff --git a/usrp2/host/lib/Makefile.am b/usrp2/host/lib/Makefile.am
index 2b6b08c..d186d6c 100644
--- a/usrp2/host/lib/Makefile.am
+++ b/usrp2/host/lib/Makefile.am
@@ -65,5 +65,4 @@ noinst_HEADERS = \
        open_usrp2_socket.h \
        pktfilter.h \
        transport.h \
-       usrp2_bytesex.h \
        usrp2_impl.h
diff --git a/usrp2/host/lib/eth_ctrl_transport.cc 
b/usrp2/host/lib/eth_ctrl_transport.cc
index e7e7386..acc979b 100644
--- a/usrp2/host/lib/eth_ctrl_transport.cc
+++ b/usrp2/host/lib/eth_ctrl_transport.cc
@@ -17,6 +17,7 @@
  */
 
 #include "eth_ctrl_transport.h"
+#include <gruel/inet.h>
 
 usrp2::eth_ctrl_transport::eth_ctrl_transport(const std::string &ifc, 
u2_mac_addr_t mac, bool target)
  : transport("ethernet control"), d_mac(mac){
diff --git a/usrp2/host/lib/find.cc b/usrp2/host/lib/find.cc
index 6e08dd4..f41e2d6 100644
--- a/usrp2/host/lib/find.cc
+++ b/usrp2/host/lib/find.cc
@@ -28,6 +28,7 @@
 #include <stdexcept>
 #include <cstdio>
 #include <gruel/thread.h>
+#include <gruel/inet.h>
 #include "eth_ctrl_transport.h"
 
 #define FIND_DEBUG false
diff --git a/usrp2/host/lib/usrp2_bytesex.h b/usrp2/host/lib/usrp2_bytesex.h
deleted file mode 100644
index 4f63d07..0000000
--- a/usrp2/host/lib/usrp2_bytesex.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <gruel/inet.h>
diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc
index 3e6a510..20f5096 100644
--- a/usrp2/host/lib/usrp2_impl.cc
+++ b/usrp2/host/lib/usrp2_impl.cc
@@ -694,7 +694,7 @@ namespace usrp2 {
 
       //clear the burst flags and count
       hdr_frag.header &= ~(VRTH_START_OF_BURST | VRTH_END_OF_BURST | 
VRTH_PKT_CNT_MASK);
-      //set the packet count
+      //set the packet count //FIXME packet count should be per stream id
       hdr_frag.header |= ((d_tx_pkt_cnt++ << VRTH_PKT_CNT_SHIFT) & 
VRTH_PKT_CNT_MASK);
       //start of burst can only be set on the first fragment
       if (hdr->header & VRTH_START_OF_BURST and fn == 0)
diff --git a/usrp2/host/lib/usrp2_impl.h b/usrp2/host/lib/usrp2_impl.h
index 1540f64..8e5c532 100644
--- a/usrp2/host/lib/usrp2_impl.h
+++ b/usrp2/host/lib/usrp2_impl.h
@@ -22,7 +22,6 @@
 #include <usrp2/usrp2.h>
 #include <usrp2/data_handler.h>
 #include <usrp2_eth_packet.h>
-#include <gruel/thread.h>
 #include <boost/scoped_ptr.hpp>
 #include <boost/thread.hpp>
 #include "control.h"