[Commit-gnuradio] [gnuradio] 101/148: flattened usrp2 hierarchy `

[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 ca6b50c0202636a16d72f8abed7e0a51c21122fb
Author: Josh Blum <address@hidden>
Date:   Sat Dec 19 00:41:05 2009 -0800

    flattened usrp2 hierarchy
    `
---
 config/grc_usrp2.m4                             | 17 +++++++--------
 usrp2/.gitignore                                | 20 ++++++++++++++++-
 usrp2/Makefile.am                               | 10 +++++++--
 usrp2/{host => }/apps/.gitignore                |  0
 usrp2/{host => }/apps/Makefile.am               |  0
 usrp2/{host => }/apps/bitrot/rx_samples.cc      |  0
 usrp2/{host => }/apps/find_usrps.cc             |  0
 usrp2/{host => }/apps/gen_2tone.py              |  0
 usrp2/{host => }/apps/gen_const.cc              |  0
 usrp2/{host => }/apps/gen_sine.py               |  0
 usrp2/{host => }/apps/gpio.cc                   |  0
 usrp2/{host => }/apps/rx_streaming_samples.cc   |  0
 usrp2/{host => }/apps/stdin_int32_fft.py        |  0
 usrp2/{host => }/apps/streaming_fft.py          |  0
 usrp2/{host => }/apps/test_mimo_tx.cc           |  0
 usrp2/{host => }/apps/tx_samples.cc             |  0
 usrp2/{host => }/apps/usrp2_burn_mac_addr.cc    |  0
 usrp2/host/.gitignore                           | 20 -----------------
 usrp2/host/Makefile.am                          | 29 -------------------------
 usrp2/host/apps/test.sh                         |  4 ----
 usrp2/{host => }/include/.gitignore             |  0
 usrp2/{host => }/include/Makefile.am            |  0
 usrp2/{host => }/include/usrp2/.gitignore       |  0
 usrp2/{host => }/include/usrp2/Makefile.am      |  0
 usrp2/{host => }/include/usrp2/copiers.h        |  0
 usrp2/{host => }/include/usrp2/data_handler.h   |  0
 usrp2/{host => }/include/usrp2/mimo_config.h    |  0
 usrp2/{host => }/include/usrp2/rx_nop_handler.h |  0
 usrp2/{host => }/include/usrp2/strtod_si.h      |  0
 usrp2/{host => }/include/usrp2/tune_result.h    |  0
 usrp2/{host => }/include/usrp2/usrp2.h          |  0
 usrp2/{host => }/include/usrp2/usrp2_cdefs.h    |  0
 usrp2/{host => }/lib/.gitignore                 |  0
 usrp2/{host => }/lib/Makefile.am                |  0
 usrp2/{host => }/lib/control.cc                 |  0
 usrp2/{host => }/lib/control.h                  |  0
 usrp2/{host => }/lib/copiers.cc                 |  0
 usrp2/{host => }/lib/data_handler.cc            |  0
 usrp2/{host => }/lib/eth_buffer.cc              |  0
 usrp2/{host => }/lib/eth_buffer.h               |  0
 usrp2/{host => }/lib/eth_common.h               |  0
 usrp2/{host => }/lib/eth_ctrl_transport.cc      |  0
 usrp2/{host => }/lib/eth_ctrl_transport.h       |  0
 usrp2/{host => }/lib/eth_data_transport.cc      |  0
 usrp2/{host => }/lib/eth_data_transport.h       |  0
 usrp2/{host => }/lib/ethernet.cc                |  0
 usrp2/{host => }/lib/ethernet.h                 |  0
 usrp2/{host => }/lib/find.cc                    |  0
 usrp2/{host => }/lib/open_usrp2_socket.cc       |  0
 usrp2/{host => }/lib/open_usrp2_socket.h        |  0
 usrp2/{host => }/lib/pktfilter.cc               |  0
 usrp2/{host => }/lib/pktfilter.h                |  0
 usrp2/{host => }/lib/rx_nop_handler.cc          |  0
 usrp2/{host => }/lib/strtod_si.c                |  0
 usrp2/{host => }/lib/transport.h                |  0
 usrp2/{host => }/lib/usrp2.cc                   |  0
 usrp2/{host => }/lib/usrp2_impl.cc              |  0
 usrp2/{host => }/lib/usrp2_impl.h               |  0
 usrp2/{host => }/lib/usrp2_socket_opener.cc     |  7 +-----
 usrp2/{host => }/usrp2.pc.in                    |  0
 60 files changed, 36 insertions(+), 71 deletions(-)

diff --git a/config/grc_usrp2.m4 b/config/grc_usrp2.m4
index fda75d8..0d60fc6 100644
--- a/config/grc_usrp2.m4
+++ b/config/grc_usrp2.m4
@@ -59,9 +59,9 @@ AC_DEFUN([GRC_USRP2],[
     fi
     if test $passed != with; then
        dnl how and where to find INCLUDES and LA
-       USRP2_INCLUDES="-I\${abs_top_srcdir}/usrp2/host/include \
+       USRP2_INCLUDES="-I\${abs_top_srcdir}/usrp2/include \
                -I\${abs_top_srcdir}/usrp2/firmware/include"
-        USRP2_LA="\${abs_top_builddir}/usrp2/host/lib/libusrp2.la"
+        USRP2_LA="\${abs_top_builddir}/usrp2/lib/libusrp2.la"
     fi
 
     dnl Include the usrp2 INCLUDES and LA
@@ -69,13 +69,12 @@ AC_DEFUN([GRC_USRP2],[
     AC_SUBST(USRP2_LA)
 
     AC_CONFIG_FILES([ \
-        usrp2/Makefile
-        usrp2/host/Makefile \
-        usrp2/host/usrp2.pc \
-        usrp2/host/include/Makefile
-        usrp2/host/include/usrp2/Makefile
-        usrp2/host/lib/Makefile
-        usrp2/host/apps/Makefile
+        usrp2/Makefile \
+        usrp2/usrp2.pc \
+        usrp2/include/Makefile
+        usrp2/include/usrp2/Makefile
+        usrp2/lib/Makefile
+        usrp2/apps/Makefile
     ])
 
     GRC_BUILD_CONDITIONAL(usrp2)
diff --git a/usrp2/.gitignore b/usrp2/.gitignore
index b336cc7..605b6fe 100644
--- a/usrp2/.gitignore
+++ b/usrp2/.gitignore
@@ -1,2 +1,20 @@
-/Makefile
+/configure
 /Makefile.in
+/config.log
+/config.status
+/config.guess
+/stamp-h1
+/config.h
+/ltmain.sh
+/config.sub
+/config.h.in
+/libtool
+/autom4te.cache
+/missing
+/aclocal.m4
+/Makefile
+/install-sh
+/depcomp
+/usrp2*.tar.gz
+/py-compile
+/usrp2.pc
diff --git a/usrp2/Makefile.am b/usrp2/Makefile.am
index 9813f38..c6de8a4 100644
--- a/usrp2/Makefile.am
+++ b/usrp2/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,4 +20,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = host firmware
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = usrp2.pc
+
+EXTRA_DIST = \
+       usrp2.pc.in
+
+SUBDIRS = include lib apps firmware
diff --git a/usrp2/host/apps/.gitignore b/usrp2/apps/.gitignore
similarity index 100%
rename from usrp2/host/apps/.gitignore
rename to usrp2/apps/.gitignore
diff --git a/usrp2/host/apps/Makefile.am b/usrp2/apps/Makefile.am
similarity index 100%
rename from usrp2/host/apps/Makefile.am
rename to usrp2/apps/Makefile.am
diff --git a/usrp2/host/apps/bitrot/rx_samples.cc 
b/usrp2/apps/bitrot/rx_samples.cc
similarity index 100%
rename from usrp2/host/apps/bitrot/rx_samples.cc
rename to usrp2/apps/bitrot/rx_samples.cc
diff --git a/usrp2/host/apps/find_usrps.cc b/usrp2/apps/find_usrps.cc
similarity index 100%
rename from usrp2/host/apps/find_usrps.cc
rename to usrp2/apps/find_usrps.cc
diff --git a/usrp2/host/apps/gen_2tone.py b/usrp2/apps/gen_2tone.py
similarity index 100%
rename from usrp2/host/apps/gen_2tone.py
rename to usrp2/apps/gen_2tone.py
diff --git a/usrp2/host/apps/gen_const.cc b/usrp2/apps/gen_const.cc
similarity index 100%
rename from usrp2/host/apps/gen_const.cc
rename to usrp2/apps/gen_const.cc
diff --git a/usrp2/host/apps/gen_sine.py b/usrp2/apps/gen_sine.py
similarity index 100%
rename from usrp2/host/apps/gen_sine.py
rename to usrp2/apps/gen_sine.py
diff --git a/usrp2/host/apps/gpio.cc b/usrp2/apps/gpio.cc
similarity index 100%
rename from usrp2/host/apps/gpio.cc
rename to usrp2/apps/gpio.cc
diff --git a/usrp2/host/apps/rx_streaming_samples.cc 
b/usrp2/apps/rx_streaming_samples.cc
similarity index 100%
rename from usrp2/host/apps/rx_streaming_samples.cc
rename to usrp2/apps/rx_streaming_samples.cc
diff --git a/usrp2/host/apps/stdin_int32_fft.py b/usrp2/apps/stdin_int32_fft.py
similarity index 100%
rename from usrp2/host/apps/stdin_int32_fft.py
rename to usrp2/apps/stdin_int32_fft.py
diff --git a/usrp2/host/apps/streaming_fft.py b/usrp2/apps/streaming_fft.py
similarity index 100%
rename from usrp2/host/apps/streaming_fft.py
rename to usrp2/apps/streaming_fft.py
diff --git a/usrp2/host/apps/test_mimo_tx.cc b/usrp2/apps/test_mimo_tx.cc
similarity index 100%
rename from usrp2/host/apps/test_mimo_tx.cc
rename to usrp2/apps/test_mimo_tx.cc
diff --git a/usrp2/host/apps/tx_samples.cc b/usrp2/apps/tx_samples.cc
similarity index 100%
rename from usrp2/host/apps/tx_samples.cc
rename to usrp2/apps/tx_samples.cc
diff --git a/usrp2/host/apps/usrp2_burn_mac_addr.cc 
b/usrp2/apps/usrp2_burn_mac_addr.cc
similarity index 100%
rename from usrp2/host/apps/usrp2_burn_mac_addr.cc
rename to usrp2/apps/usrp2_burn_mac_addr.cc
diff --git a/usrp2/host/.gitignore b/usrp2/host/.gitignore
deleted file mode 100644
index 605b6fe..0000000
--- a/usrp2/host/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-/configure
-/Makefile.in
-/config.log
-/config.status
-/config.guess
-/stamp-h1
-/config.h
-/ltmain.sh
-/config.sub
-/config.h.in
-/libtool
-/autom4te.cache
-/missing
-/aclocal.m4
-/Makefile
-/install-sh
-/depcomp
-/usrp2*.tar.gz
-/py-compile
-/usrp2.pc
diff --git a/usrp2/host/Makefile.am b/usrp2/host/Makefile.am
deleted file mode 100644
index b6e30b5..0000000
--- a/usrp2/host/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2008 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio 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, or (at your option)
-# any later version.
-# 
-# GNU Radio 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = usrp2.pc
-
-EXTRA_DIST = \
-       usrp2.pc.in        
-
-SUBDIRS = include lib apps
diff --git a/usrp2/host/apps/test.sh b/usrp2/host/apps/test.sh
deleted file mode 100755
index c533c33..0000000
--- a/usrp2/host/apps/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-sudo ./rx_streaming_samples -d 4 -v -N 100M
-
diff --git a/usrp2/host/include/.gitignore b/usrp2/include/.gitignore
similarity index 100%
rename from usrp2/host/include/.gitignore
rename to usrp2/include/.gitignore
diff --git a/usrp2/host/include/Makefile.am b/usrp2/include/Makefile.am
similarity index 100%
rename from usrp2/host/include/Makefile.am
rename to usrp2/include/Makefile.am
diff --git a/usrp2/host/include/usrp2/.gitignore 
b/usrp2/include/usrp2/.gitignore
similarity index 100%
rename from usrp2/host/include/usrp2/.gitignore
rename to usrp2/include/usrp2/.gitignore
diff --git a/usrp2/host/include/usrp2/Makefile.am 
b/usrp2/include/usrp2/Makefile.am
similarity index 100%
rename from usrp2/host/include/usrp2/Makefile.am
rename to usrp2/include/usrp2/Makefile.am
diff --git a/usrp2/host/include/usrp2/copiers.h b/usrp2/include/usrp2/copiers.h
similarity index 100%
rename from usrp2/host/include/usrp2/copiers.h
rename to usrp2/include/usrp2/copiers.h
diff --git a/usrp2/host/include/usrp2/data_handler.h 
b/usrp2/include/usrp2/data_handler.h
similarity index 100%
rename from usrp2/host/include/usrp2/data_handler.h
rename to usrp2/include/usrp2/data_handler.h
diff --git a/usrp2/host/include/usrp2/mimo_config.h 
b/usrp2/include/usrp2/mimo_config.h
similarity index 100%
rename from usrp2/host/include/usrp2/mimo_config.h
rename to usrp2/include/usrp2/mimo_config.h
diff --git a/usrp2/host/include/usrp2/rx_nop_handler.h 
b/usrp2/include/usrp2/rx_nop_handler.h
similarity index 100%
rename from usrp2/host/include/usrp2/rx_nop_handler.h
rename to usrp2/include/usrp2/rx_nop_handler.h
diff --git a/usrp2/host/include/usrp2/strtod_si.h 
b/usrp2/include/usrp2/strtod_si.h
similarity index 100%
rename from usrp2/host/include/usrp2/strtod_si.h
rename to usrp2/include/usrp2/strtod_si.h
diff --git a/usrp2/host/include/usrp2/tune_result.h 
b/usrp2/include/usrp2/tune_result.h
similarity index 100%
rename from usrp2/host/include/usrp2/tune_result.h
rename to usrp2/include/usrp2/tune_result.h
diff --git a/usrp2/host/include/usrp2/usrp2.h b/usrp2/include/usrp2/usrp2.h
similarity index 100%
rename from usrp2/host/include/usrp2/usrp2.h
rename to usrp2/include/usrp2/usrp2.h
diff --git a/usrp2/host/include/usrp2/usrp2_cdefs.h 
b/usrp2/include/usrp2/usrp2_cdefs.h
similarity index 100%
rename from usrp2/host/include/usrp2/usrp2_cdefs.h
rename to usrp2/include/usrp2/usrp2_cdefs.h
diff --git a/usrp2/host/lib/.gitignore b/usrp2/lib/.gitignore
similarity index 100%
rename from usrp2/host/lib/.gitignore
rename to usrp2/lib/.gitignore
diff --git a/usrp2/host/lib/Makefile.am b/usrp2/lib/Makefile.am
similarity index 100%
rename from usrp2/host/lib/Makefile.am
rename to usrp2/lib/Makefile.am
diff --git a/usrp2/host/lib/control.cc b/usrp2/lib/control.cc
similarity index 100%
rename from usrp2/host/lib/control.cc
rename to usrp2/lib/control.cc
diff --git a/usrp2/host/lib/control.h b/usrp2/lib/control.h
similarity index 100%
rename from usrp2/host/lib/control.h
rename to usrp2/lib/control.h
diff --git a/usrp2/host/lib/copiers.cc b/usrp2/lib/copiers.cc
similarity index 100%
rename from usrp2/host/lib/copiers.cc
rename to usrp2/lib/copiers.cc
diff --git a/usrp2/host/lib/data_handler.cc b/usrp2/lib/data_handler.cc
similarity index 100%
rename from usrp2/host/lib/data_handler.cc
rename to usrp2/lib/data_handler.cc
diff --git a/usrp2/host/lib/eth_buffer.cc b/usrp2/lib/eth_buffer.cc
similarity index 100%
rename from usrp2/host/lib/eth_buffer.cc
rename to usrp2/lib/eth_buffer.cc
diff --git a/usrp2/host/lib/eth_buffer.h b/usrp2/lib/eth_buffer.h
similarity index 100%
rename from usrp2/host/lib/eth_buffer.h
rename to usrp2/lib/eth_buffer.h
diff --git a/usrp2/host/lib/eth_common.h b/usrp2/lib/eth_common.h
similarity index 100%
rename from usrp2/host/lib/eth_common.h
rename to usrp2/lib/eth_common.h
diff --git a/usrp2/host/lib/eth_ctrl_transport.cc 
b/usrp2/lib/eth_ctrl_transport.cc
similarity index 100%
rename from usrp2/host/lib/eth_ctrl_transport.cc
rename to usrp2/lib/eth_ctrl_transport.cc
diff --git a/usrp2/host/lib/eth_ctrl_transport.h 
b/usrp2/lib/eth_ctrl_transport.h
similarity index 100%
rename from usrp2/host/lib/eth_ctrl_transport.h
rename to usrp2/lib/eth_ctrl_transport.h
diff --git a/usrp2/host/lib/eth_data_transport.cc 
b/usrp2/lib/eth_data_transport.cc
similarity index 100%
rename from usrp2/host/lib/eth_data_transport.cc
rename to usrp2/lib/eth_data_transport.cc
diff --git a/usrp2/host/lib/eth_data_transport.h 
b/usrp2/lib/eth_data_transport.h
similarity index 100%
rename from usrp2/host/lib/eth_data_transport.h
rename to usrp2/lib/eth_data_transport.h
diff --git a/usrp2/host/lib/ethernet.cc b/usrp2/lib/ethernet.cc
similarity index 100%
rename from usrp2/host/lib/ethernet.cc
rename to usrp2/lib/ethernet.cc
diff --git a/usrp2/host/lib/ethernet.h b/usrp2/lib/ethernet.h
similarity index 100%
rename from usrp2/host/lib/ethernet.h
rename to usrp2/lib/ethernet.h
diff --git a/usrp2/host/lib/find.cc b/usrp2/lib/find.cc
similarity index 100%
rename from usrp2/host/lib/find.cc
rename to usrp2/lib/find.cc
diff --git a/usrp2/host/lib/open_usrp2_socket.cc 
b/usrp2/lib/open_usrp2_socket.cc
similarity index 100%
rename from usrp2/host/lib/open_usrp2_socket.cc
rename to usrp2/lib/open_usrp2_socket.cc
diff --git a/usrp2/host/lib/open_usrp2_socket.h b/usrp2/lib/open_usrp2_socket.h
similarity index 100%
rename from usrp2/host/lib/open_usrp2_socket.h
rename to usrp2/lib/open_usrp2_socket.h
diff --git a/usrp2/host/lib/pktfilter.cc b/usrp2/lib/pktfilter.cc
similarity index 100%
rename from usrp2/host/lib/pktfilter.cc
rename to usrp2/lib/pktfilter.cc
diff --git a/usrp2/host/lib/pktfilter.h b/usrp2/lib/pktfilter.h
similarity index 100%
rename from usrp2/host/lib/pktfilter.h
rename to usrp2/lib/pktfilter.h
diff --git a/usrp2/host/lib/rx_nop_handler.cc b/usrp2/lib/rx_nop_handler.cc
similarity index 100%
rename from usrp2/host/lib/rx_nop_handler.cc
rename to usrp2/lib/rx_nop_handler.cc
diff --git a/usrp2/host/lib/strtod_si.c b/usrp2/lib/strtod_si.c
similarity index 100%
rename from usrp2/host/lib/strtod_si.c
rename to usrp2/lib/strtod_si.c
diff --git a/usrp2/host/lib/transport.h b/usrp2/lib/transport.h
similarity index 100%
rename from usrp2/host/lib/transport.h
rename to usrp2/lib/transport.h
diff --git a/usrp2/host/lib/usrp2.cc b/usrp2/lib/usrp2.cc
similarity index 100%
rename from usrp2/host/lib/usrp2.cc
rename to usrp2/lib/usrp2.cc
diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/lib/usrp2_impl.cc
similarity index 100%
rename from usrp2/host/lib/usrp2_impl.cc
rename to usrp2/lib/usrp2_impl.cc
diff --git a/usrp2/host/lib/usrp2_impl.h b/usrp2/lib/usrp2_impl.h
similarity index 100%
rename from usrp2/host/lib/usrp2_impl.h
rename to usrp2/lib/usrp2_impl.h
diff --git a/usrp2/host/lib/usrp2_socket_opener.cc 
b/usrp2/lib/usrp2_socket_opener.cc
similarity index 96%
rename from usrp2/host/lib/usrp2_socket_opener.cc
rename to usrp2/lib/usrp2_socket_opener.cc
index 27d3935..aa1d758 100644
--- a/usrp2/host/lib/usrp2_socket_opener.cc
+++ b/usrp2/lib/usrp2_socket_opener.cc
@@ -33,12 +33,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#elif defined(HAVE_NETINET_IN_H)
-#include <netinet/in.h>
-#endif
-
+#include <gruel/inet.h>
 
 ssize_t
 write_fd(int fd, const void *ptr, size_t nbytes, int sendfd)
diff --git a/usrp2/host/usrp2.pc.in b/usrp2/usrp2.pc.in
similarity index 100%
rename from usrp2/host/usrp2.pc.in
rename to usrp2/usrp2.pc.in