diff options
| author | Josh Blum | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /gr-uhd/include | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
| download | gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.gz gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.bz2 gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gr-uhd/include')
| -rw-r--r-- | gr-uhd/include/gr_uhd_amsg_source.h | 4 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 1 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/gr-uhd/include/gr_uhd_amsg_source.h b/gr-uhd/include/gr_uhd_amsg_source.h index bc0feb438..accf15ce2 100644 --- a/gr-uhd/include/gr_uhd_amsg_source.h +++ b/gr-uhd/include/gr_uhd_amsg_source.h @@ -28,6 +28,10 @@ class uhd_amsg_source; +/*! + * \brief Make a new USRP asynchronous message-based source block. + * \ingroup uhd_blk + */ GR_UHD_API boost::shared_ptr<uhd_amsg_source> uhd_make_amsg_source( const uhd::device_addr_t &device_addr, gr_msg_queue_sptr msgq diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index c1fc3b09e..f11d00063 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -30,6 +30,7 @@ class uhd_usrp_sink; /*! * \brief Make a new USRP sink block. + * \ingroup uhd_blk * * The USRP sink block reads a stream and transmits the samples. * The sink block also provides API calls for transmitter settings. diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index f8ac9361e..fecc6e94d 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -30,6 +30,7 @@ class uhd_usrp_source; /*! * \brief Make a new USRP source block. + * \ingroup uhd_blk * * The USRP source block receives samples and writes to a stream. * The source block also provides API calls for receiver settings. |