Merged r11377:11390 from jcorgan/usrp-headers in to trunk.

* Public USRP(1) header files are now in their own source directory
  and install into $(includedir)/usrp.  This was done to avoid name
  clashes in the top-level include directory.

  Only users who are developing directly to libusrp in C++ are
  affected; the GNU Radio C++ and Python APIs are unchanged.

  The simple change required by this update is to change:

  #include <usrp_*.h> 

  to #include 

  <usrp/usrp_*.h> 

  ...in your source code.

* Removed usrp-inband code from tree (put into limbo directory.)
  This code has become unmaintained and has started to suffer
  from bitrot.  A checkpoint tag has been made for anyone still
  needing to use it:

  http://gnuradio.org/svn/gnuradio/tags/checkpoints/trunk-20090708-pre-usrp-reorg

  The plan during the 3.2->3.3 development cycle is to replace the
  functions done by the in-band code with extensions to the existing
  gr-usrp blocks using the new message passing architecture.

  The USRP hardware FPGA code that provided the inband interface
  has not been removed; however, it too has become unmaintained and
  will likely be rewritten/replaced during the 3.3 timeframe.

The trunk passes distcheck.




git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11394 221aa14e-8319-0410-a670-987f0aec2ac5

12 files changed, 33 insertions, 33 deletions

diff --git a/gr-usrp/src/usrp_base.cc b/gr-usrp/src/usrp_base.cc
index a4cf64ed7..1d632a567 100644
--- a/gr-usrp/src/usrp_base.cc
+++ b/gr-usrp/src/usrp_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 #include <usrp_base.h>
-#include <usrp_basic.h>
+#include <usrp/usrp_basic.h>
 
 class truth_table_element_t 
 {
diff --git a/gr-usrp/src/usrp_base.h b/gr-usrp/src/usrp_base.h
index a914159e6..7947723fb 100644
--- a/gr-usrp/src/usrp_base.h
+++ b/gr-usrp/src/usrp_base.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,8 +24,8 @@
 #include <gr_sync_block.h>
 #include <stdexcept>
 #include <boost/shared_ptr.hpp>
-#include <db_base.h>
-#include <usrp_subdev_spec.h>
+#include <usrp/db_base.h>
+#include <usrp/usrp_subdev_spec.h>
 
 class usrp_basic;
 
diff --git a/gr-usrp/src/usrp_sink_base.cc b/gr-usrp/src/usrp_sink_base.cc
index cb65e02cd..635d9345f 100644
--- a/gr-usrp/src/usrp_sink_base.cc
+++ b/gr-usrp/src/usrp_sink_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 
 #include <usrp_sink_base.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <assert.h>
 #include <cstdio>
 
diff --git a/gr-usrp/src/usrp_sink_base.h b/gr-usrp/src/usrp_sink_base.h
index b27813a42..8d573af1b 100644
--- a/gr-usrp/src/usrp_sink_base.h
+++ b/gr-usrp/src/usrp_sink_base.h
@@ -1,7 +1,7 @@
 
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_base.h>
 #include <stdexcept>
-#include <usrp_tune_result.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_tune_result.h>
+#include <usrp/usrp_dbid.h>
 
 class usrp_standard_tx;
 
diff --git a/gr-usrp/src/usrp_sink_c.cc b/gr-usrp/src/usrp_sink_c.cc
index 363a113fc..40750b477 100644
--- a/gr-usrp/src/usrp_sink_c.cc
+++ b/gr-usrp/src/usrp_sink_c.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_sink_c.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 usrp_sink_c_sptr
 usrp_make_sink_c (int which_board,
diff --git a/gr-usrp/src/usrp_sink_s.cc b/gr-usrp/src/usrp_sink_s.cc
index adbf3acbd..1f51da24d 100644
--- a/gr-usrp/src/usrp_sink_s.cc
+++ b/gr-usrp/src/usrp_sink_s.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_sink_s.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 usrp_sink_s_sptr
 usrp_make_sink_s (int which_board,
diff --git a/gr-usrp/src/usrp_source_base.cc b/gr-usrp/src/usrp_source_base.cc
index 99efbcdda..85bd91715 100644
--- a/gr-usrp/src/usrp_source_base.cc
+++ b/gr-usrp/src/usrp_source_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 
 #include <usrp_source_base.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <assert.h>
 #include <cstdio>
 
diff --git a/gr-usrp/src/usrp_source_base.h b/gr-usrp/src/usrp_source_base.h
index e1d091d89..4def48e24 100644
--- a/gr-usrp/src/usrp_source_base.h
+++ b/gr-usrp/src/usrp_source_base.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,8 +25,8 @@
 
 #include <usrp_base.h>
 #include <stdexcept>
-#include <usrp_tune_result.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_tune_result.h>
+#include <usrp/usrp_dbid.h>
 
 class usrp_standard_rx;
 
diff --git a/gr-usrp/src/usrp_source_c.cc b/gr-usrp/src/usrp_source_c.cc
index 71ca1e0d7..26d95dc1b 100644
--- a/gr-usrp/src/usrp_source_c.cc
+++ b/gr-usrp/src/usrp_source_c.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_source_c.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 static const int NBASIC_SAMPLES_PER_ITEM = 2;	// I & Q
 
diff --git a/gr-usrp/src/usrp_source_s.cc b/gr-usrp/src/usrp_source_s.cc
index f20384599..88b8495d3 100644
--- a/gr-usrp/src/usrp_source_s.cc
+++ b/gr-usrp/src/usrp_source_s.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_source_s.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 static const int NBASIC_SAMPLES_PER_ITEM = 1;
 
diff --git a/gr-usrp/src/usrp_standard.i b/gr-usrp/src/usrp_standard.i
index 7d32cdf81..61053bb3b 100644
--- a/gr-usrp/src/usrp_standard.i
+++ b/gr-usrp/src/usrp_standard.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,13 +23,13 @@
 // FIXME: move to usrp/usrpm component
 
 %{
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <usrp_spi_defs.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_dbid.h>
 %}
 
 %include <usrp_spi_defs.h>
-%include <usrp_dbid.h>
+%include <usrp/usrp_dbid.h>
 
 %constant int FPGA_MODE_NORMAL   = usrp_standard_rx::FPGA_MODE_NORMAL;
 %constant int FPGA_MODE_LOOPBACK = usrp_standard_rx::FPGA_MODE_LOOPBACK;
diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index f5841985d..2a47877c3 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -26,8 +26,8 @@
 #include <vector>
 %}
 
-%include <usrp_subdev_spec.h>
-%include <db_base.i>
+%include <usrp/usrp_subdev_spec.h>
+%include <usrp/db_base.i>
 %include <fpga_regs_common.h>
 %include <fpga_regs_standard.h>
 %include "usrp_standard.i"