From f3e2e07201c50033bf6c9d0c6a6f068557b4f17f Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 17 Apr 2013 13:43:52 -0400
Subject: runtime: converting runtime core to gr namespace, gnuradio include
dir.
---
gr-pager/lib/flex_parse_impl.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'gr-pager/lib/flex_parse_impl.h')
diff --git a/gr-pager/lib/flex_parse_impl.h b/gr-pager/lib/flex_parse_impl.h
index a4fcf03d42..f741957f90 100644
--- a/gr-pager/lib/flex_parse_impl.h
+++ b/gr-pager/lib/flex_parse_impl.h
@@ -24,8 +24,8 @@
#define INCLUDED_PAGER_FLEX_PARSE_IMPL_H
#include <pager/flex_parse.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
#include "flex_modes.h"
#include <sstream>
@@ -38,7 +38,7 @@ namespace gr {
{
private:
std::ostringstream d_payload;
- gr_msg_queue_sptr d_queue; // Destination for decoded pages
+ msg_queue::sptr d_queue; // Destination for decoded pages
int d_count; // Count of received codewords
int d_datawords[88]; // 11 blocks of 8 32-bit words
@@ -56,7 +56,7 @@ namespace gr {
void parse_unknown(int mw1, int mw2);
public:
- flex_parse_impl(gr_msg_queue_sptr queue, float freq);
+ flex_parse_impl(msg_queue::sptr queue, float freq);
~flex_parse_impl();
int work(int noutput_items,
--
cgit v1.2.3
From 3e3083d2b6722a137cc6850e9d8f8b74008601e0 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <johnathan@corganlabs.com>
Date: Mon, 29 Apr 2013 22:10:39 -0700
Subject: pager: moved include dir to gnuradio/pager
---
gr-pager/CMakeLists.txt | 2 +-
gr-pager/include/gnuradio/pager/CMakeLists.txt | 32 +++++++++++++
gr-pager/include/gnuradio/pager/api.h | 33 ++++++++++++++
.../include/gnuradio/pager/flex_deinterleave.h | 51 +++++++++++++++++++++
gr-pager/include/gnuradio/pager/flex_frame.h | 48 ++++++++++++++++++++
gr-pager/include/gnuradio/pager/flex_parse.h | 52 +++++++++++++++++++++
gr-pager/include/gnuradio/pager/flex_sync.h | 49 ++++++++++++++++++++
gr-pager/include/gnuradio/pager/slicer_fb.h | 53 ++++++++++++++++++++++
gr-pager/include/pager/CMakeLists.txt | 32 -------------
gr-pager/include/pager/api.h | 33 --------------
gr-pager/include/pager/flex_deinterleave.h | 51 ---------------------
gr-pager/include/pager/flex_frame.h | 48 --------------------
gr-pager/include/pager/flex_parse.h | 52 ---------------------
gr-pager/include/pager/flex_sync.h | 49 --------------------
gr-pager/include/pager/slicer_fb.h | 53 ----------------------
gr-pager/lib/flex_deinterleave_impl.h | 2 +-
gr-pager/lib/flex_frame_impl.h | 2 +-
gr-pager/lib/flex_parse_impl.h | 2 +-
gr-pager/lib/flex_sync_impl.h | 2 +-
gr-pager/lib/slicer_fb_impl.h | 2 +-
gr-pager/swig/CMakeLists.txt | 2 +-
gr-pager/swig/pager_swig.i | 20 ++++----
22 files changed, 335 insertions(+), 335 deletions(-)
create mode 100644 gr-pager/include/gnuradio/pager/CMakeLists.txt
create mode 100644 gr-pager/include/gnuradio/pager/api.h
create mode 100644 gr-pager/include/gnuradio/pager/flex_deinterleave.h
create mode 100644 gr-pager/include/gnuradio/pager/flex_frame.h
create mode 100644 gr-pager/include/gnuradio/pager/flex_parse.h
create mode 100644 gr-pager/include/gnuradio/pager/flex_sync.h
create mode 100644 gr-pager/include/gnuradio/pager/slicer_fb.h
delete mode 100644 gr-pager/include/pager/CMakeLists.txt
delete mode 100644 gr-pager/include/pager/api.h
delete mode 100644 gr-pager/include/pager/flex_deinterleave.h
delete mode 100644 gr-pager/include/pager/flex_frame.h
delete mode 100644 gr-pager/include/pager/flex_parse.h
delete mode 100644 gr-pager/include/pager/flex_sync.h
delete mode 100644 gr-pager/include/pager/slicer_fb.h
(limited to 'gr-pager/lib/flex_parse_impl.h')
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt
index 48c11d6840..04c7e2c504 100644
--- a/gr-pager/CMakeLists.txt
+++ b/gr-pager/CMakeLists.txt
@@ -91,7 +91,7 @@ CPACK_COMPONENT("pager_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/pager)
+add_subdirectory(include/gnuradio/pager)
add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(python)
diff --git a/gr-pager/include/gnuradio/pager/CMakeLists.txt b/gr-pager/include/gnuradio/pager/CMakeLists.txt
new file mode 100644
index 0000000000..6577e7f4e6
--- /dev/null
+++ b/gr-pager/include/gnuradio/pager/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Copyright 2012,2013 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 GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+ api.h
+ flex_frame.h
+ slicer_fb.h
+ flex_deinterleave.h
+ flex_parse.h
+ flex_sync.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/pager
+ COMPONENT "pager_devel"
+)
diff --git a/gr-pager/include/gnuradio/pager/api.h b/gr-pager/include/gnuradio/pager/api.h
new file mode 100644
index 0000000000..3d76e6761a
--- /dev/null
+++ b/gr-pager/include/gnuradio/pager/api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 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 GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PAGER_API_H
+#define INCLUDED_PAGER_API_H
+
+#include <gnuradio/attributes.h>
+
+#ifdef gnuradio_pager_EXPORTS
+# define PAGER_API __GR_ATTR_EXPORT
+#else
+# define PAGER_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_PAGER_API_H */
diff --git a/gr-pager/include/gnuradio/pager/flex_deinterleave.h b/gr-pager/include/gnuradio/pager/flex_deinterleave.h
new file mode 100644
index 0000000000..2b0c4353d6
--- /dev/null
+++ b/gr-pager/include/gnuradio/pager/flex_deinterleave.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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 GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
+#define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
+
+#include <gnuradio/pager/api.h>
+#include <gnuradio/sync_decimator.h>
+
+namespace gr {
+ namespace pager {
+
+ /*!
+ * \brief flex deinterleave description
+ * \ingroup pager_blk
+ */
+ class PAGER_API flex_deinterleave : virtual public sync_decimator
+ {
+ public:
+ // gr::pager::flex_deinterleave::sptr
+ typedef boost::shared_ptr<flex_deinterleave> sptr;
+
+ /*!
+ * \brief Make flex deinterleaver
+ */
+ static sptr make();
+ };
+
+ } /* namespace pager */
+} /* namespace gr */
+
+#endif /* INCLUDED_PAGER_FLEX_DEINTERLEAVE_H */
diff --git a/gr-pager/include/gnuradio/pager/flex_frame.h b/gr-pager/include/gnuradio/pager/flex_frame.h
new file mode 100644
index 0000000000..7245c9a00c
--- /dev/null
+++ b/gr-pager/include/gnuradio/pager/flex_frame.h
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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 GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PAGER_FLEX_FRAME_H
+#define INCLUDED_PAGER_FLEX_FRAME_H
+
+#include <gnuradio/pager/api.h>
+#include <boost/shared_ptr.hpp>
+
+namespace gr {
+ namespace pager {
+
+ /*!
+ * \brief flex_frame.
+ * \ingroup pager_blk
+ */
+ class PAGER_API flex_frame
+ {
+ public:
+ // gr::pager::flex_frame::sptr
+ typedef boost::shared_ptr<flex_frame> sptr;
+
+ static sptr make();
+ };
+
+ } /* namespace pager */
+} /* namespace gr */
+
+#endif /* INCLUDED_PAGER_FLEX_FRAME_H */
diff --git a/gr-pager/include/gnuradio/pager/flex_parse.h b/gr-pager/include/gnuradio/pager/flex_parse.h
new file mode 100644
index 0000000000..42adaff6e0
--- /dev/null
+++ b/gr-pager/include/gnuradio/pager/flex_parse.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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 GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PAGER_FLEX_PARSE_H
+#define INCLUDED_PAGER_FLEX_PARSE_H
+
+#include <gnuradio/pager/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
+#include <sstream>
+
+namespace gr {
+ namespace pager {
+
+#define FIELD_DELIM ((unsigned char)128)
+
+ /*!
+ * \brief flex parse description
+ * \ingroup pager_blk
+ */
+ class PAGER_API flex_parse : virtual public sync_block
+ {
+ public:
+ // gr::pager::flex_parse::sptr
+ typedef boost::shared_ptr<flex_parse> sptr;
+
+ static sptr make(msg_queue::sptr queue, float freq);
+ };
+
+ } /* namespace pager */
+} /* namespace gr */
+
+#endif /* INCLUDED_PAGER_FLEX_PARSE_H */
diff --git a/gr-pager/include/gnuradio/pager/flex_sync.h b/gr-pager/include/gnuradio/pager/flex_sync.h
new file mode 100644
index 0000000000..54c3d827a2
--- /dev/null
+++ b/gr-pager/include/gnuradio/pager/flex_sync.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PAGER_FLEX_SYNC_H
+#define INCLUDED_PAGER_FLEX_SYNC_H
+
+#include <gnuradio/pager/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace pager {
+
+ /*!
+ * \brief flex sync description
+ * \ingroup pager_blk
+ */
+ class PAGER_API flex_sync : virtual public block
+ {
+ public:
+ // gr::pager::flex_sync::sptr
+ typedef boost::shared_ptr<flex_sync> sptr;
+
+ static sptr make();
+
+ };
+
+ } /* namespace pager */
+} /* namespace gr */
+
+#endif /* INCLUDED_PAGER_FLEX_SYNC_H */
diff --git a/gr-pager/include/gnuradio/pager/slicer_fb.h b/gr-pager/include/gnuradio/pager/slicer_fb.h
new file mode 100644
index 0000000000..6f01a254c3
--- /dev/null
+++ b/gr-pager/include/gnuradio/pager/slicer_fb.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007,2012 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 GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PAGER_SLICER_FB_H
+#define INCLUDED_PAGER_SLICER_FB_H
+
+#include <gnuradio/pager/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace pager {
+
+ /*!
+ * \brief slicer description
+ * \ingroup pager_blk
+ */
+ class PAGER_API slicer_fb : virtual public sync_block
+ {
+ public:
+ // gr::pager::slicer_fb::sptr
+ typedef boost::shared_ptr<slicer_fb> sptr;
+
+ /*!
+ * \brief Make a pager slicer
+ */
+ static sptr make(float alpha);
+
+ virtual float dc_offset() const = 0;
+ };
+
+ } /* namespace pager */
+} /* namespace gr */
+
+#endif /* INCLUDED_PAGER_SLICER_FB_H */
diff --git a/gr-pager/include/pager/CMakeLists.txt b/gr-pager/include/pager/CMakeLists.txt
deleted file mode 100644
index 6577e7f4e6..0000000000
--- a/gr-pager/include/pager/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2012,2013 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 GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-########################################################################
-# Install header files
-########################################################################
-install(FILES
- api.h
- flex_frame.h
- slicer_fb.h
- flex_deinterleave.h
- flex_parse.h
- flex_sync.h
- DESTINATION ${GR_INCLUDE_DIR}/gnuradio/pager
- COMPONENT "pager_devel"
-)
diff --git a/gr-pager/include/pager/api.h b/gr-pager/include/pager/api.h
deleted file mode 100644
index 3d76e6761a..0000000000
--- a/gr-pager/include/pager/api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011 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 GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_PAGER_API_H
-#define INCLUDED_PAGER_API_H
-
-#include <gnuradio/attributes.h>
-
-#ifdef gnuradio_pager_EXPORTS
-# define PAGER_API __GR_ATTR_EXPORT
-#else
-# define PAGER_API __GR_ATTR_IMPORT
-#endif
-
-#endif /* INCLUDED_PAGER_API_H */
diff --git a/gr-pager/include/pager/flex_deinterleave.h b/gr-pager/include/pager/flex_deinterleave.h
deleted file mode 100644
index 9b394d85cd..0000000000
--- a/gr-pager/include/pager/flex_deinterleave.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2012 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 GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
-#define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
-
-#include <pager/api.h>
-#include <gnuradio/sync_decimator.h>
-
-namespace gr {
- namespace pager {
-
- /*!
- * \brief flex deinterleave description
- * \ingroup pager_blk
- */
- class PAGER_API flex_deinterleave : virtual public sync_decimator
- {
- public:
- // gr::pager::flex_deinterleave::sptr
- typedef boost::shared_ptr<flex_deinterleave> sptr;
-
- /*!
- * \brief Make flex deinterleaver
- */
- static sptr make();
- };
-
- } /* namespace pager */
-} /* namespace gr */
-
-#endif /* INCLUDED_PAGER_FLEX_DEINTERLEAVE_H */
diff --git a/gr-pager/include/pager/flex_frame.h b/gr-pager/include/pager/flex_frame.h
deleted file mode 100644
index 7e2dd3e0a6..0000000000
--- a/gr-pager/include/pager/flex_frame.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2012 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 GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_PAGER_FLEX_FRAME_H
-#define INCLUDED_PAGER_FLEX_FRAME_H
-
-#include <pager/api.h>
-#include <boost/shared_ptr.hpp>
-
-namespace gr {
- namespace pager {
-
- /*!
- * \brief flex_frame.
- * \ingroup pager_blk
- */
- class PAGER_API flex_frame
- {
- public:
- // gr::pager::flex_frame::sptr
- typedef boost::shared_ptr<flex_frame> sptr;
-
- static sptr make();
- };
-
- } /* namespace pager */
-} /* namespace gr */
-
-#endif /* INCLUDED_PAGER_FLEX_FRAME_H */
diff --git a/gr-pager/include/pager/flex_parse.h b/gr-pager/include/pager/flex_parse.h
deleted file mode 100644
index 9594528377..0000000000
--- a/gr-pager/include/pager/flex_parse.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2012 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 GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_PAGER_FLEX_PARSE_H
-#define INCLUDED_PAGER_FLEX_PARSE_H
-
-#include <pager/api.h>
-#include <gnuradio/sync_block.h>
-#include <gnuradio/msg_queue.h>
-#include <sstream>
-
-namespace gr {
- namespace pager {
-
-#define FIELD_DELIM ((unsigned char)128)
-
- /*!
- * \brief flex parse description
- * \ingroup pager_blk
- */
- class PAGER_API flex_parse : virtual public sync_block
- {
- public:
- // gr::pager::flex_parse::sptr
- typedef boost::shared_ptr<flex_parse> sptr;
-
- static sptr make(msg_queue::sptr queue, float freq);
- };
-
- } /* namespace pager */
-} /* namespace gr */
-
-#endif /* INCLUDED_PAGER_FLEX_PARSE_H */
diff --git a/gr-pager/include/pager/flex_sync.h b/gr-pager/include/pager/flex_sync.h
deleted file mode 100644
index 3d0f1dd5ff..0000000000
--- a/gr-pager/include/pager/flex_sync.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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 GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_PAGER_FLEX_SYNC_H
-#define INCLUDED_PAGER_FLEX_SYNC_H
-
-#include <pager/api.h>
-#include <gnuradio/block.h>
-
-namespace gr {
- namespace pager {
-
- /*!
- * \brief flex sync description
- * \ingroup pager_blk
- */
- class PAGER_API flex_sync : virtual public block
- {
- public:
- // gr::pager::flex_sync::sptr
- typedef boost::shared_ptr<flex_sync> sptr;
-
- static sptr make();
-
- };
-
- } /* namespace pager */
-} /* namespace gr */
-
-#endif /* INCLUDED_PAGER_FLEX_SYNC_H */
diff --git a/gr-pager/include/pager/slicer_fb.h b/gr-pager/include/pager/slicer_fb.h
deleted file mode 100644
index 66fcbd37e6..0000000000
--- a/gr-pager/include/pager/slicer_fb.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007,2012 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 GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_PAGER_SLICER_FB_H
-#define INCLUDED_PAGER_SLICER_FB_H
-
-#include <pager/api.h>
-#include <gnuradio/sync_block.h>
-
-namespace gr {
- namespace pager {
-
- /*!
- * \brief slicer description
- * \ingroup pager_blk
- */
- class PAGER_API slicer_fb : virtual public sync_block
- {
- public:
- // gr::pager::slicer_fb::sptr
- typedef boost::shared_ptr<slicer_fb> sptr;
-
- /*!
- * \brief Make a pager slicer
- */
- static sptr make(float alpha);
-
- virtual float dc_offset() const = 0;
- };
-
- } /* namespace pager */
-} /* namespace gr */
-
-#endif /* INCLUDED_PAGER_SLICER_FB_H */
diff --git a/gr-pager/lib/flex_deinterleave_impl.h b/gr-pager/lib/flex_deinterleave_impl.h
index defa83b395..79aabf4320 100644
--- a/gr-pager/lib/flex_deinterleave_impl.h
+++ b/gr-pager/lib/flex_deinterleave_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_IMPL_H
#define INCLUDED_PAGER_FLEX_DEINTERLEAVE_IMPL_H
-#include <pager/flex_deinterleave.h>
+#include <gnuradio/pager/flex_deinterleave.h>
#include <gnuradio/sync_decimator.h>
namespace gr {
diff --git a/gr-pager/lib/flex_frame_impl.h b/gr-pager/lib/flex_frame_impl.h
index 0a6ec80293..e7d1139041 100644
--- a/gr-pager/lib/flex_frame_impl.h
+++ b/gr-pager/lib/flex_frame_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_PAGER_FLEX_FRAME_IMPL_H
#define INCLUDED_PAGER_FLEX_FRAME_IMPL_H
-#include <pager/flex_frame.h>
+#include <gnuradio/pager/flex_frame.h>
namespace gr {
namespace pager {
diff --git a/gr-pager/lib/flex_parse_impl.h b/gr-pager/lib/flex_parse_impl.h
index f741957f90..f2e4236c56 100644
--- a/gr-pager/lib/flex_parse_impl.h
+++ b/gr-pager/lib/flex_parse_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_PAGER_FLEX_PARSE_IMPL_H
#define INCLUDED_PAGER_FLEX_PARSE_IMPL_H
-#include <pager/flex_parse.h>
+#include <gnuradio/pager/flex_parse.h>
#include <gnuradio/sync_block.h>
#include <gnuradio/msg_queue.h>
#include "flex_modes.h"
diff --git a/gr-pager/lib/flex_sync_impl.h b/gr-pager/lib/flex_sync_impl.h
index ba18c147dc..9bc5111e7f 100644
--- a/gr-pager/lib/flex_sync_impl.h
+++ b/gr-pager/lib/flex_sync_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_PAGER_FLEX_SYNC_IMPL_H
#define INCLUDED_PAGER_FLEX_SYNC_IMPL_H
-#include <pager/flex_sync.h>
+#include <gnuradio/pager/flex_sync.h>
namespace gr {
namespace pager {
diff --git a/gr-pager/lib/slicer_fb_impl.h b/gr-pager/lib/slicer_fb_impl.h
index c758a4b160..d2d6ba7d89 100644
--- a/gr-pager/lib/slicer_fb_impl.h
+++ b/gr-pager/lib/slicer_fb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_PAGER_SLICER_FB_IMPL_H
#define INCLUDED_PAGER_SLICER_FB_IMPL_H
-#include <pager/slicer_fb.h>
+#include <gnuradio/pager/slicer_fb.h>
namespace gr {
namespace pager {
diff --git a/gr-pager/swig/CMakeLists.txt b/gr-pager/swig/CMakeLists.txt
index 076b5387fb..b63c45c15d 100644
--- a/gr-pager/swig/CMakeLists.txt
+++ b/gr-pager/swig/CMakeLists.txt
@@ -35,7 +35,7 @@ if(ENABLE_GR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pager_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/pager)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/pager)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-pager)
diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i
index b558d5a6cd..cacd993e9a 100644
--- a/gr-pager/swig/pager_swig.i
+++ b/gr-pager/swig/pager_swig.i
@@ -27,18 +27,18 @@
%include "pager_swig_doc.i"
%{
-#include "pager/flex_frame.h"
-#include "pager/slicer_fb.h"
-#include "pager/flex_sync.h"
-#include "pager/flex_deinterleave.h"
-#include "pager/flex_parse.h"
+#include "gnuradio/pager/flex_frame.h"
+#include "gnuradio/pager/slicer_fb.h"
+#include "gnuradio/pager/flex_sync.h"
+#include "gnuradio/pager/flex_deinterleave.h"
+#include "gnuradio/pager/flex_parse.h"
%}
-%include "pager/flex_frame.h"
-%include "pager/slicer_fb.h"
-%include "pager/flex_sync.h"
-%include "pager/flex_deinterleave.h"
-%include "pager/flex_parse.h"
+%include "gnuradio/pager/flex_frame.h"
+%include "gnuradio/pager/slicer_fb.h"
+%include "gnuradio/pager/flex_sync.h"
+%include "gnuradio/pager/flex_deinterleave.h"
+%include "gnuradio/pager/flex_parse.h"
GR_SWIG_BLOCK_MAGIC2(pager, flex_frame);
GR_SWIG_BLOCK_MAGIC2(pager, slicer_fb);
--
cgit v1.2.3