Merge remote branch 'jblum/uhd' into next

* jblum/uhd:
  using the send and recv full buffer modes, avoids extra loop in implementation
  Added call to get access to the underlying uhd simple usrp object.
  added docs to uhd grc blocks, added pkg config path to make support easier
  typo fix, called variable ant, not antenna
  added to uhd grc files, also removed warning for grc generator with uhd blocks
  added more access methods to uhd source and sink
  fix for paradigm shift
  Use simple usrp from uhd.
  gr-uhd working with io type
  added swig includes and tune result return
  using new streaming api
  added set center freq call
  Added samp rate param and using the simple device from uhd
  removed timeout from here
  Got the source and sink working with current uhd.
  Added the uhd simple sink lib block, swig wrapper, grc wrapper.
  using samples prop, added unchecked in files for utils and grc rx wrapper
  recv noise with uhd
  Created simple source (with nothing in it) and some swig build stuff.
  Created gr uhd skeleton build.

1 files changed, 47 insertions, 0 deletions

diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
new file mode 100644
index 000000000..870a8abc6
--- /dev/null
+++ b/config/grc_gr_uhd.m4
@@ -0,0 +1,47 @@
+dnl Copyright 2010 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GR_UHD],[
+    GRC_ENABLE(gr-uhd)
+
+    dnl Dont do gr-uhd if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-uhd, gnuradio-core)
+
+    if test $passed = yes; then
+        #by default, cmake likes to install the uhd.pc file here
+        #so lets make life easier for everybody and add this path
+        export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig
+        PKG_CHECK_MODULES(
+            [UHD], [uhd], [],
+            [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd])]
+        )
+        AC_SUBST(UHD_CFLAGS)
+        AC_SUBST(UHD_LIBS)
+    fi
+
+    AC_CONFIG_FILES([ \
+        gr-uhd/Makefile \
+        gr-uhd/apps/Makefile \
+        gr-uhd/grc/Makefile \
+        gr-uhd/lib/Makefile \
+        gr-uhd/swig/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gr-uhd)
+])