summaryrefslogtreecommitdiff
path: root/gr-pager
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-07-22 10:33:13 -0700
committerJosh Blum <josh@joshknows.com>2011-07-22 10:33:13 -0700
commitec2d3a033616386dbf8f8b2e7010a4d0a5ec3132 (patch)
tree0aafe7f48bd6552cda48dd726b20ef70c305e3f9 /gr-pager
parentd760edf9fb851d97c972a69690b26114dd998157 (diff)
gr: added API macros for noaa and pager, also renamed the ones for digital and vocoder to be consistent
Diffstat (limited to 'gr-pager')
-rw-r--r--gr-pager/CMakeLists.txt3
-rw-r--r--gr-pager/lib/CMakeLists.txt1
-rw-r--r--gr-pager/lib/Makefile.am1
-rw-r--r--gr-pager/lib/pager_api.h33
-rw-r--r--gr-pager/lib/pager_flex_deinterleave.h7
-rw-r--r--gr-pager/lib/pager_flex_frame.h7
-rw-r--r--gr-pager/lib/pager_flex_parse.h7
-rw-r--r--gr-pager/lib/pager_flex_sync.h7
-rw-r--r--gr-pager/lib/pager_slicer_fb.h7
9 files changed, 55 insertions, 18 deletions
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt
index e5c3a33961..b138acc381 100644
--- a/gr-pager/CMakeLists.txt
+++ b/gr-pager/CMakeLists.txt
@@ -27,13 +27,10 @@ INCLUDE(GrBoost)
########################################################################
INCLUDE(GrComponent)
GR_REGISTER_COMPONENT("gr-pager" ENABLE_GR_PAGER
- UNIX #FIXME until we get MSVC working
Boost_FOUND
ENABLE_GR_CORE_
)
-REMOVE_DEFINITIONS(-fvisibility=hidden) #FIXME until we do symbol visibility
-
GR_SET_GLOBAL(GR_PAGER_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/lib
)
diff --git a/gr-pager/lib/CMakeLists.txt b/gr-pager/lib/CMakeLists.txt
index 40aec57c8c..c797f733b8 100644
--- a/gr-pager/lib/CMakeLists.txt
+++ b/gr-pager/lib/CMakeLists.txt
@@ -62,6 +62,7 @@ INSTALL(TARGETS gnuradio-pager
# Install header files
########################################################################
INSTALL(FILES
+ pager_api.h
pager_slicer_fb.h
pager_flex_sync.h
pager_flex_deinterleave.h
diff --git a/gr-pager/lib/Makefile.am b/gr-pager/lib/Makefile.am
index 29c82ebe88..b6131171df 100644
--- a/gr-pager/lib/Makefile.am
+++ b/gr-pager/lib/Makefile.am
@@ -25,6 +25,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
+ pager_api.h \
pager_slicer_fb.h \
pager_flex_sync.h \
pager_flex_deinterleave.h \
diff --git a/gr-pager/lib/pager_api.h b/gr-pager/lib/pager_api.h
new file mode 100644
index 0000000000..4312c5ae38
--- /dev/null
+++ b/gr-pager/lib/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 <gruel/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/lib/pager_flex_deinterleave.h b/gr-pager/lib/pager_flex_deinterleave.h
index 7211a71ad4..87094490dc 100644
--- a/gr-pager/lib/pager_flex_deinterleave.h
+++ b/gr-pager/lib/pager_flex_deinterleave.h
@@ -22,23 +22,24 @@
#ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
#define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
+#include <pager_api.h>
#include <gr_sync_decimator.h>
class pager_flex_deinterleave;
typedef boost::shared_ptr<pager_flex_deinterleave> pager_flex_deinterleave_sptr;
-pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
+PAGER_API pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
/*!
* \brief flex deinterleave description
* \ingroup pager_blk
*/
-class pager_flex_deinterleave : public gr_sync_decimator
+class PAGER_API pager_flex_deinterleave : public gr_sync_decimator
{
private:
// Constructors
- friend pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
+ friend PAGER_API pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
pager_flex_deinterleave();
// One FLEX block of deinterleaved data
diff --git a/gr-pager/lib/pager_flex_frame.h b/gr-pager/lib/pager_flex_frame.h
index 1f4999e2bc..857b49d29a 100644
--- a/gr-pager/lib/pager_flex_frame.h
+++ b/gr-pager/lib/pager_flex_frame.h
@@ -21,6 +21,7 @@
#ifndef INCLUDED_PAGER_FLEX_FRAME_H
#define INCLUDED_PAGER_FLEX_FRAME_H
+#include <pager_api.h>
#include <boost/shared_ptr.hpp>
class pager_flex_frame;
@@ -29,15 +30,15 @@ typedef boost::shared_ptr<pager_flex_frame> pager_flex_frame_sptr;
/*!
* \brief public constructor for pager_flex_frame
*/
-pager_flex_frame_sptr pager_make_flex_frame();
+PAGER_API pager_flex_frame_sptr pager_make_flex_frame();
/*!
* \brief flex_frame.
*/
-class pager_flex_frame {
+class PAGER_API pager_flex_frame {
// Constructor is private to force use of shared_ptr
pager_flex_frame();
- friend pager_flex_frame_sptr pager_make_flex_frame();
+ friend PAGER_API pager_flex_frame_sptr pager_make_flex_frame();
public:
~pager_flex_frame();
diff --git a/gr-pager/lib/pager_flex_parse.h b/gr-pager/lib/pager_flex_parse.h
index 0f7cfb3702..dcbd19eae5 100644
--- a/gr-pager/lib/pager_flex_parse.h
+++ b/gr-pager/lib/pager_flex_parse.h
@@ -22,6 +22,7 @@
#ifndef INCLUDED_PAGER_FLEX_PARSE_H
#define INCLUDED_PAGER_FLEX_PARSE_H
+#include <pager_api.h>
#include <gr_sync_block.h>
#include <gr_msg_queue.h>
#include <pageri_flex_modes.h>
@@ -30,7 +31,7 @@
class pager_flex_parse;
typedef boost::shared_ptr<pager_flex_parse> pager_flex_parse_sptr;
-pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
+PAGER_API pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
#define FIELD_DELIM ((unsigned char)128)
@@ -38,11 +39,11 @@ pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq)
* \brief flex parse description
* \ingroup pager_blk
*/
-class pager_flex_parse : public gr_sync_block
+class PAGER_API pager_flex_parse : public gr_sync_block
{
private:
// Constructors
- friend pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
+ friend PAGER_API pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
pager_flex_parse(gr_msg_queue_sptr queue, float freq);
std::ostringstream d_payload;
diff --git a/gr-pager/lib/pager_flex_sync.h b/gr-pager/lib/pager_flex_sync.h
index b401bf5327..53b6f950a4 100644
--- a/gr-pager/lib/pager_flex_sync.h
+++ b/gr-pager/lib/pager_flex_sync.h
@@ -22,24 +22,25 @@
#ifndef INCLUDED_PAGER_FLEX_SYNC_H
#define INCLUDED_PAGER_FLEX_SYNC_H
+#include <pager_api.h>
#include <gr_block.h>
class pager_flex_sync;
typedef boost::shared_ptr<pager_flex_sync> pager_flex_sync_sptr;
typedef std::vector<gr_int64> gr_int64_vector;
-pager_flex_sync_sptr pager_make_flex_sync();
+PAGER_API pager_flex_sync_sptr pager_make_flex_sync();
/*!
* \brief flex sync description
* \ingroup pager_blk
*/
-class pager_flex_sync : public gr_block
+class PAGER_API pager_flex_sync : public gr_block
{
private:
// Constructors
- friend pager_flex_sync_sptr pager_make_flex_sync();
+ friend PAGER_API pager_flex_sync_sptr pager_make_flex_sync();
pager_flex_sync();
// State machine transitions
diff --git a/gr-pager/lib/pager_slicer_fb.h b/gr-pager/lib/pager_slicer_fb.h
index 75eea3cd30..b3d92780fc 100644
--- a/gr-pager/lib/pager_slicer_fb.h
+++ b/gr-pager/lib/pager_slicer_fb.h
@@ -22,21 +22,22 @@
#ifndef INCLUDED_PAGER_SLICER_FB_H
#define INCLUDED_PAGER_SLICER_FB_H
+#include <pager_api.h>
#include <gr_sync_block.h>
class pager_slicer_fb;
typedef boost::shared_ptr<pager_slicer_fb> pager_slicer_fb_sptr;
-pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
+PAGER_API pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
/*!
* \brief slicer description
* \ingroup pager_blk
*/
-class pager_slicer_fb : public gr_sync_block
+class PAGER_API pager_slicer_fb : public gr_sync_block
{
private:
- friend pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
+ friend PAGER_API pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
pager_slicer_fb(float alpha);
unsigned char slice(float sample);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 13:59:01 +0000