summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gr-uhd/lib/Makefile.am3
-rw-r--r--gr-uhd/lib/gr_uhd_api.h33
-rw-r--r--gr-uhd/lib/uhd_multi_usrp_sink.h7
-rw-r--r--gr-uhd/lib/uhd_multi_usrp_source.h7
-rw-r--r--gr-uhd/lib/uhd_single_usrp_sink.h7
-rw-r--r--gr-uhd/lib/uhd_single_usrp_source.h7
-rw-r--r--gr-uhd/swig/__init__.py2
-rw-r--r--gr-uhd/swig/uhd_swig.i2
8 files changed, 53 insertions, 15 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index 1bcfbbbdc..7ddb45cb3 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -41,6 +41,7 @@ libgnuradio_uhd_la_LIBADD = \
libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS)
grinclude_HEADERS = \
+ gr_uhd_api.h \
uhd_multi_usrp_source.h \
uhd_multi_usrp_sink.h \
uhd_single_usrp_source.h \
diff --git a/gr-uhd/lib/gr_uhd_api.h b/gr-uhd/lib/gr_uhd_api.h
new file mode 100644
index 000000000..a9b99fd87
--- /dev/null
+++ b/gr-uhd/lib/gr_uhd_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_GR_UHD_API_H
+#define INCLUDED_GR_UHD_API_H
+
+#include <uhd/config.hpp>
+
+#ifdef gnuradio_uhd_EXPORTS
+# define GR_UHD_API UHD_EXPORT
+#else
+# define GR_UHD_API UHD_EXPORT
+#endif
+
+#endif /* INCLUDED_GR_UHD_API_H */
diff --git a/gr-uhd/lib/uhd_multi_usrp_sink.h b/gr-uhd/lib/uhd_multi_usrp_sink.h
index 370e59d0e..4a92cba6c 100644
--- a/gr-uhd/lib/uhd_multi_usrp_sink.h
+++ b/gr-uhd/lib/uhd_multi_usrp_sink.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 Free Software Foundation, Inc.
+ * Copyright 2010-2011 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -22,18 +22,19 @@
#ifndef INCLUDED_UHD_MULTI_USRP_SINK_H
#define INCLUDED_UHD_MULTI_USRP_SINK_H
+#include <gr_uhd_api.h>
#include <gr_sync_block.h>
#include <uhd/usrp/multi_usrp.hpp>
class uhd_multi_usrp_sink;
-boost::shared_ptr<uhd_multi_usrp_sink> uhd_make_multi_usrp_sink(
+GR_UHD_API boost::shared_ptr<uhd_multi_usrp_sink> uhd_make_multi_usrp_sink(
const std::string &device_addr,
const uhd::io_type_t::tid_t &io_type,
size_t num_channels
);
-class uhd_multi_usrp_sink : public gr_sync_block{
+class GR_UHD_API uhd_multi_usrp_sink : public gr_sync_block{
public:
/*!
diff --git a/gr-uhd/lib/uhd_multi_usrp_source.h b/gr-uhd/lib/uhd_multi_usrp_source.h
index b3cbdae1f..841f8fb44 100644
--- a/gr-uhd/lib/uhd_multi_usrp_source.h
+++ b/gr-uhd/lib/uhd_multi_usrp_source.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 Free Software Foundation, Inc.
+ * Copyright 2010-2011 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -22,18 +22,19 @@
#ifndef INCLUDED_UHD_MULTI_USRP_SOURCE_H
#define INCLUDED_UHD_MULTI_USRP_SOURCE_H
+#include <gr_uhd_api.h>
#include <gr_sync_block.h>
#include <uhd/usrp/multi_usrp.hpp>
class uhd_multi_usrp_source;
-boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
+GR_UHD_API boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
const std::string &device_addr,
const uhd::io_type_t::tid_t &io_type,
size_t num_channels
);
-class uhd_multi_usrp_source : public gr_sync_block{
+class GR_UHD_API uhd_multi_usrp_source : public gr_sync_block{
public:
/*!
diff --git a/gr-uhd/lib/uhd_single_usrp_sink.h b/gr-uhd/lib/uhd_single_usrp_sink.h
index a4c4e6452..432798a6d 100644
--- a/gr-uhd/lib/uhd_single_usrp_sink.h
+++ b/gr-uhd/lib/uhd_single_usrp_sink.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 Free Software Foundation, Inc.
+ * Copyright 2010-2011 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -22,18 +22,19 @@
#ifndef INCLUDED_UHD_SINGLE_USRP_SINK_H
#define INCLUDED_UHD_SINGLE_USRP_SINK_H
+#include <gr_uhd_api.h>
#include <gr_sync_block.h>
#include <uhd/usrp/single_usrp.hpp>
class uhd_single_usrp_sink;
-boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
+GR_UHD_API boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
const std::string &device_addr,
const uhd::io_type_t::tid_t &io_type,
size_t num_channels = 1
);
-class uhd_single_usrp_sink : public gr_sync_block{
+class GR_UHD_API uhd_single_usrp_sink : public gr_sync_block{
public:
/*!
diff --git a/gr-uhd/lib/uhd_single_usrp_source.h b/gr-uhd/lib/uhd_single_usrp_source.h
index 2a011b2b3..9b7255533 100644
--- a/gr-uhd/lib/uhd_single_usrp_source.h
+++ b/gr-uhd/lib/uhd_single_usrp_source.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 Free Software Foundation, Inc.
+ * Copyright 2010-2011 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -22,18 +22,19 @@
#ifndef INCLUDED_UHD_SINGLE_USRP_SOURCE_H
#define INCLUDED_UHD_SINGLE_USRP_SOURCE_H
+#include <gr_uhd_api.h>
#include <gr_sync_block.h>
#include <uhd/usrp/single_usrp.hpp>
class uhd_single_usrp_source;
-boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
+GR_UHD_API boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
const std::string &device_addr,
const uhd::io_type_t::tid_t &io_type,
size_t num_channels = 1
);
-class uhd_single_usrp_source : public gr_sync_block{
+class GR_UHD_API uhd_single_usrp_source : public gr_sync_block{
public:
/*!
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py
index a8082bc34..157733880 100644
--- a/gr-uhd/swig/__init__.py
+++ b/gr-uhd/swig/__init__.py
@@ -1,5 +1,5 @@
#
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2011 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 5628a1203..89f82e9f4 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2010 Free Software Foundation, Inc.
+ * Copyright 2010-2011 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
generated by cgit (git 2.34.1) at 2024-12-21 05:20:01 +0000