diff options
Diffstat (limited to 'gr-usrp/src')
-rw-r--r-- | gr-usrp/src/usrp_base.cc | 4 | ||||
-rw-r--r-- | gr-usrp/src/usrp_base.h | 6 | ||||
-rw-r--r-- | gr-usrp/src/usrp_sink_base.cc | 4 | ||||
-rw-r--r-- | gr-usrp/src/usrp_sink_base.h | 6 | ||||
-rw-r--r-- | gr-usrp/src/usrp_sink_c.cc | 6 | ||||
-rw-r--r-- | gr-usrp/src/usrp_sink_s.cc | 6 | ||||
-rw-r--r-- | gr-usrp/src/usrp_source_base.cc | 4 | ||||
-rw-r--r-- | gr-usrp/src/usrp_source_base.h | 6 | ||||
-rw-r--r-- | gr-usrp/src/usrp_source_c.cc | 6 | ||||
-rw-r--r-- | gr-usrp/src/usrp_source_s.cc | 6 | ||||
-rw-r--r-- | gr-usrp/src/usrp_standard.i | 8 | ||||
-rw-r--r-- | gr-usrp/src/usrp_swig.i | 4 |
12 files changed, 33 insertions, 33 deletions
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" |