summaryrefslogtreecommitdiff
path: root/gr-usrp
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2009-07-09 02:55:51 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2009-07-09 02:55:51 +0000
commitc276a4ffee9314d2528166547abfd2c09d29713f (patch)
tree03b06ac67874342ba671a4a0405e006de1ece9ba /gr-usrp
parenteefb51c0c0fac68d16544e492aebd883528607e1 (diff)
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
Diffstat (limited to 'gr-usrp')
-rw-r--r--gr-usrp/apps/Makefile.am4
-rw-r--r--gr-usrp/src/usrp_base.cc4
-rw-r--r--gr-usrp/src/usrp_base.h6
-rw-r--r--gr-usrp/src/usrp_sink_base.cc4
-rw-r--r--gr-usrp/src/usrp_sink_base.h6
-rw-r--r--gr-usrp/src/usrp_sink_c.cc6
-rw-r--r--gr-usrp/src/usrp_sink_s.cc6
-rw-r--r--gr-usrp/src/usrp_source_base.cc4
-rw-r--r--gr-usrp/src/usrp_source_base.h6
-rw-r--r--gr-usrp/src/usrp_source_c.cc6
-rw-r--r--gr-usrp/src/usrp_source_s.cc6
-rw-r--r--gr-usrp/src/usrp_standard.i8
-rw-r--r--gr-usrp/src/usrp_swig.i4
13 files changed, 34 insertions, 36 deletions
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am
index 824a489747..92938061f6 100644
--- a/gr-usrp/apps/Makefile.am
+++ b/gr-usrp/apps/Makefile.am
@@ -24,9 +24,7 @@ include $(top_srcdir)/Makefile.common
# For compiling within the GNU Radio build tree
AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
-I$(top_srcdir)/gr-usrp/src \
- -I$(top_srcdir)/usrp/host/lib/legacy \
- -I\${abs_top_builddir}/usrp/host/lib/legacy \
- -I$(top_srcdir)/usrp/firmware/include \
+ $(USRP_INCLUDES) \
$(WITH_INCLUDES)
GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la
diff --git a/gr-usrp/src/usrp_base.cc b/gr-usrp/src/usrp_base.cc
index a4cf64ed73..1d632a5673 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 a914159e61..7947723fba 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 cb65e02cd9..635d9345f0 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 b27813a42a..8d573af1b0 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 363a113fc8..40750b477d 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 adbf3acbd9..1f51da24db 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 99efbcdda9..85bd917154 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 e1d091d893..4def48e24c 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 71ca1e0d7c..26d95dc1b3 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 f20384599f..88b8495d36 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 7d32cdf813..61053bb3b2 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 f5841985dd..2a47877c3c 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"
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-15 07:13:50 +0000